modify/delete conflict resolution overwrites untracked file
[git] / builtin-ls-files.c
2008-12-03  Junio C HamanoMerge branch 'jk/maint-commit-v-strip' into maint
2008-12-03  Junio C HamanoMerge branch 'bc/maint-keep-pack' into maint
2008-12-01  Junio C HamanoMerge branch 'st/maint-tag' into maint
2008-12-01  Junio C HamanoMerge branch 'mk/maint-cg-push' into maint
2008-11-16  Junio C HamanoTeach ls-files --with-tree=<tree> to work with options...
2008-11-16  Junio C Hamanobuiltin-ls-files.c: coding style fix.
2008-11-09  Junio C HamanoMerge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09  Junio C HamanoMerge branch 'ar/maint-mksnpath' into maint
2008-11-09  Junio C HamanoMerge branch 'mv/maint-branch-m-symref' into maint
2008-11-02  Junio C HamanoMerge branch 'js/maint-fetch-update-head' into maint
2008-11-02  Junio C HamanoMerge branch 'jk/maint-ls-files-other' into maint
2008-11-02  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-17  Jeff Kingrefactor handling of "other" files in ls-files and...
2008-09-19  Junio C HamanoMerge branch 'jc/maint-name-hash-clear' into maint
2008-09-10  Junio C HamanoMerge branch 'jc/maint-hide-cr-in-diff-from-less' into...
2008-09-10  Junio C HamanoMerge branch 'jc/maint-checkout-fix' into maint
2008-09-10  Junio C HamanoMerge branch 'np/maint-safer-pack' into maint
2008-09-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-09-03  Junio C HamanoMerge branch 'nd/worktree' into maint
2008-09-03  Junio C HamanoMerge branch 'ho/dashless' into maint
2008-08-31  Junio C Hamano'git foo' program identifies itself without dash in...
2008-08-17  Junio C HamanoMerge git-gui 0.11.0
2008-08-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-14  Junio C HamanoMerge branch 'maint'
2008-08-13  Junio C HamanoMerge branch 'maint'
2008-08-12  Junio C HamanoMerge branch 'maint'
2008-08-11  Junio C HamanoMerge branch 'maint'
2008-08-11  Junio C HamanoMerge branch 'maint'
2008-08-09  Junio C HamanoMerge branch 'maint'
2008-08-06  Junio C HamanoSync with 1.5.6.5
2008-08-06  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-08-06  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06  Junio C HamanoMerge branch 'maint'
2008-08-03  Junio C HamanoMerge branch 'maint'
2008-08-02  Junio C HamanoMerge branch 'maint'
2008-08-02  Junio C HamanoMerge branch 'maint'
2008-07-30  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-25  Junio C HamanoMerge branch 'maint'
2008-07-24  Junio C HamanoMerge branch 'maint' into ph/checkout
2008-07-21  Junio C HamanoMerge branch 'ap/trackinfo' v1.6.0-rc0
2008-07-21  Junio C HamanoMerge branch 'jc/rerere-auto-more'
2008-07-21  Junio C HamanoMerge branch 'ns/am-abort'
2008-07-21  Junio C HamanoMerge branch 'maint'
2008-07-19  Junio C HamanoMerge branch 'maint'
2008-07-17  Junio C HamanoMerge branch 'mv/dashless'
2008-07-17  Junio C HamanoMerge branch 'ls/mailinfo'
2008-07-17  Junio C HamanoMerge branch 'sb/dashless'
2008-07-15  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-13  Stephan BeyerMake usage strings dash-less
2008-07-08  Junio C HamanoMerge branch 'jc/blame' (early part) into HEAD
2008-07-08  Junio C HamanoMerge branch 'lt/racy-empty' into maint
2008-07-07  Junio C HamanoMerge branch 'dr/ceiling'
2008-07-06  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-06-27  Junio C HamanoMerge branch 'maint-1.5.5' into maint
2008-06-27  Junio C HamanoMerge branch 'maint-1.5.4' into maint-1.5.5
2008-06-25  Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context' into...
2008-06-22  Junio C HamanoMerge branch 'lt/racy-empty'
2008-06-22  Junio C HamanoMerge branch 'jc/maint-combine-diff-pre-context'
2008-06-17  Junio C HamanoMerge branch 'maint'
2008-06-16  Junio C HamanoMerge branch 'maint'
2008-06-11  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-11  Junio C HamanoMerge branch 'maint'
2008-06-09  Junio C HamanoMerge branch 'js/merge-recursive'
2008-06-09  Junio C HamanoMerge branch 'maint'
2008-06-07  Junio C HamanoMerge 1.5.5.4 in
2008-06-06  Junio C HamanoMerge branch 'maint'
2008-06-04  Junio C HamanoMerge branch 'maint'
2008-05-28  Junio C HamanoMerge 1.5.5.3 in
2008-05-27  Junio C HamanoMerge branch 'jc/diff-no-no-index'
2008-05-27  Junio C HamanoMerge branch 'maint'
2008-05-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-05-26  Junio C HamanoMerge branch 'maint'
2008-05-26  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-25  Junio C HamanoMerge branch 'js/config-cb' v1.5.6-rc0
2008-05-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-23  Junio C HamanoMerge branch 'maint-1.5.4' into maint v1.5.5.2
2008-05-21  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-15  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-05-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-14  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-14  Johannes SchindelinProvide git_config with a callback-data parameter
2008-05-11  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-09  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-05-04  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-30  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-28  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-25  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-23  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-19  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-17  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-16  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-12  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-12  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-10  Junio C HamanoMerge branch 'maint-1.5.4' into maint
2008-04-09  Junio C HamanoMerge branch 'jc/rename'
2008-04-09  Junio C HamanoMerge branch 'mk/unpack-careful'
2008-04-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-07  Junio C HamanoMerge branch 'jc/maint-apply-match-beginning'
2008-04-05  Junio C HamanoMerge git://repo.or.cz/git-gui
next