modify/delete conflict resolution overwrites untracked file
[git] / builtin-rm.c
2008-01-24  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-01-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-01-16  Brandon CaseyImprove use of lockfile API
2008-01-11  Junio C HamanoMerge ../gitk
2008-01-09  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2008-01-08  Junio C HamanoMerge in GIT 1.5.3.8
2008-01-05  Junio C HamanoMerge git://repo.or.cz/git-gui
2007-12-31  Junio C HamanoMerge branch 'maint' of git://linux-nfs.org/~bfields/git
2007-12-18  Junio C HamanoMerge branch 'maint'
2007-12-09  Junio C HamanoMerge branch 'jc/spht'
2007-12-09  Junio C HamanoMerge branch 'maint'
2007-12-07  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-12-07  Junio C HamanoMerge branch 'maint'
2007-12-06  Junio C HamanoMerge branch 'maint'
2007-12-02  Junio C HamanoMerge branch 'maint'
2007-12-01  Junio C HamanoMerge 1.5.3.7 in
2007-12-01  Junio C HamanoMerge branch 'maint'
2007-11-29  Junio C HamanoMerge branch 'maint'
2007-11-26  Junio C HamanoMerge branch 'maint'
2007-11-25  Junio C HamanoMerge branch 'maint'
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-23  Junio C HamanoMerge branch 'maint'
2007-11-21  Junio C HamanoMerge git://repo.or.cz/git-gui
2007-11-21  Junio C HamanoMerge branch 'maint'
2007-11-19  Junio C HamanoMerge branch 'maint'
2007-11-19  Junio C HamanoMerge branch 'lt/rev-list-interactive'
2007-11-18  Junio C HamanoMerge branch 'maint' to synchronize with 1.5.3.6
2007-11-18  Junio C HamanoMerge branch 'ph/parseopt-sh'
2007-11-17  Junio C HamanoMerge branch 'maint'
2007-11-14  Junio C HamanoMerge branch 'bs/maint-commit-options'
2007-11-14  Junio C HamanoMerge branch 'rv/maint-index-commit'
2007-11-14  Junio C HamanoMerge branch 'bs/maint-t7005'
2007-11-14  Junio C HamanoMerge branch 'jc/maint-add-sync-stat'
2007-11-14  Junio C HamanoMerge branch 'mh/retag'
2007-11-14  Junio C HamanoMerge branch 'jc/stash-create'
2007-11-14  Junio C HamanoMerge branch 'bg/format-patch-N'
2007-11-14  Junio C HamanoMerge branch 'np/progress'
2007-11-14  Junio C HamanoMerge branch 'rr/cvsexportcommit-w'
2007-11-14  Junio C HamanoMerge branch 'maint'
2007-11-14  Junio C HamanoMerge branch 'db/remote-builtin' into jk/send-pack
2007-11-12  Junio C HamanoMerge branch 'maint'
2007-11-12  Junio C HamanoMerge branch 'sp/maint-plug-traverse-commit-list-leak...
2007-11-11  Junio C HamanoMerge branch 'js/upload-pack'
2007-11-11  Junio C HamanoMerge branch 'js/reset'
2007-11-11  Junio C HamanoMerge branch 'js/parseopt-abbrev-fix'
2007-11-11  Junio C HamanoMerge branch 'maint'
2007-11-10  Junio C HamanoMerge branch 'maint'
2007-11-10  Junio C HamanoMerge master into aw/mirror-push
2007-11-09  Junio C HamanoMerge branch 'maint'
2007-11-08  Junio C HamanoMerge branch 'jc/clean-config'
2007-11-08  Junio C HamanoMerge branch 'gp/reset-q'
2007-11-08  Junio C HamanoMerge branch 'ds/maint-deflatebound'
2007-11-08  Junio C HamanoMerge branch 'cp/p4'
2007-11-08  Junio C HamanoMerge branch 'maint'
2007-11-08  Junio C HamanoMerge branch 'mh/work-tree'
2007-11-06  Mike HommeyDon't always require working tree for git-rm
2007-11-06  Junio C HamanoMerge branch 'maint'
2007-11-04  Junio C HamanoMerge branch 'jc/format-patch-encoding'
2007-11-04  Junio C HamanoMerge branch 'jc/revert-merge'
2007-11-04  Junio C HamanoMerge branch 'ss/mailsplit'
2007-11-04  Junio C HamanoMerge branch 'np/pack'
2007-11-04  Junio C HamanoMerge branch 'jn/gitweb'
2007-11-04  Junio C HamanoMerge branch 'maint'
2007-11-02  Junio C HamanoMerge branch 'maint'
2007-11-02  Junio C HamanoMerge branch 'ph/parseopt'
2007-11-02  Junio C HamanoMerge branch 'gp/maint-diffdoc'
2007-11-02  Junio C HamanoMerge branch 'maint'
2007-11-01  Junio C HamanoMerge branch 'bk/maint-cvsexportcommit'
2007-10-31  Junio C HamanoMerge branch 'maint' to catch up with 1.5.3.5
2007-10-31  Junio C HamanoMerge branch 'maint' into HEAD
2007-10-30  Pierre HabouzitMake builtin-rm.c use parse_options.
2007-10-29  Junio C HamanoMerge branch 'maint'
2007-10-28  Junio C HamanoMerge branch 'master' of git://git./gitk/gitk
2007-10-27  Junio C HamanoMerge branch 'maint'
2007-10-21  Shawn O. PearceMerge branch 'maint'
2007-10-21  Shawn O. PearceMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-10-21  Shawn O. PearceMerge branch 'maint' of git://repo.or.cz/git-gui into...
2007-10-19  Shawn O. PearceMerge branch 'maint'
2007-10-19  Shawn O. PearceMerge branch 'maint'
2007-10-18  Shawn O. PearceMerge branch 'maint'
2007-10-18  Shawn O. PearceMerge branch 'lt/diff-rename'
2007-10-17  Shawn O. PearceMerge branch 'maint'
2007-10-16  Shawn O. PearceMerge branch 'maint'
2007-10-03  Junio C HamanoMerge branch 'jc/autogc'
2007-10-03  Junio C HamanoSync with GIT 1.5.3.4
2007-10-01  Junio C HamanoMerge branch 'maint'
2007-09-30  Junio C HamanoMerge branch 'maint'
2007-09-29  Junio C HamanoMerge branch 'ss/svnimport'
2007-09-29  Junio C HamanoSync with GIT 1.5.3.3
2007-09-26  Junio C HamanoMerge branch 'jc/autogc' into js/rebase-i
2007-09-25  Junio C HamanoMerge branch 'maint'
2007-09-24  Junio C HamanoMerge branch 'jn/web'
2007-09-24  Junio C HamanoMerge branch 'maint'
2007-09-19  Junio C HamanoMerge branch 'maint' to sync with 1.5.3.2
2007-09-19  Junio C HamanoMerge branch 'master' into ph/strbuf
2007-09-19  Junio C HamanoMerge branch 'maint'
2007-09-18  Junio C HamanoMerge branch 'cr/reset'
2007-09-18  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
next