Be more user-friendly when refusing to do something because of conflict.
[git] / t / t4201-shortlog.sh
2009-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-12-09  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-12-09  Junio C HamanoMerge branch 'mm/maint-merge-ff-error-message-fix'...
2009-12-09  Junio C HamanoMerge branch 'jn/maint-pull-rebase-error-message' into...
2009-12-09  Junio C HamanoMerge branch 'jk/maint-add-p-delete-fix' into maint
2009-12-03  Junio C HamanoMerge branch 'maint'
2009-12-03  Junio C HamanoMerge branch 'uk/maint-shortlog-encoding' into maint
2009-12-03  Brandon Caseyt4201: use ISO8859-1 rather than ISO-8859-1
2009-12-03  Junio C HamanoMerge in 1.6.5.4
2009-12-03  Junio C HamanoMerge branch 'maint'
2009-12-02  Junio C HamanoMerge branch 'maint'
2009-12-01  Junio C HamanoMerge branch 'maint'
2009-12-01  Junio C HamanoMerge branch 'jc/deprecate-old-syntax-from-merge'
2009-12-01  Junio C HamanoMerge branch 'bw/remote-get-ref-states-fix'
2009-12-01  Junio C HamanoMerge branch 'jn/gitweb-blame'
2009-11-30  Junio C HamanoMerge branch 'fc/maint-format-patch-pathspec-dashes'
2009-11-30  Junio C HamanoMerge branch 'mm/maint-merge-ff-error-message-fix'
2009-11-30  Junio C HamanoMerge branch 'ap/maint-merge-strategy-list-fix'
2009-11-30  Junio C HamanoMerge branch 'jc/pretty-lf'
2009-11-30  Junio C HamanoMerge branch 'cc/bisect-doc'
2009-11-30  Junio C HamanoMerge branch 'em/commit-claim'
2009-11-30  Junio C HamanoMerge branch 'jc/mailinfo-remove-brackets'
2009-11-30  Junio C HamanoMerge branch 'fc/send-email-envelope'
2009-11-30  Junio C HamanoMerge branch 'uk/maint-shortlog-encoding'
2009-11-25  Uwe Kleine-Königshortlog: respect commit encoding
2009-10-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-09-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-16  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-20  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-06-11  Junio C HamanoMerge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
2009-05-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2009-05-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-02  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11  Junio C HamanoMerge branch 'maint-1.5.4' into maint-1.5.5
2008-12-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-18  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-17  Junio C HamanoGIT 1.5.5.6 v1.5.5.6
2008-12-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-12-02  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-16  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-11-02  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-21  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-09-25  Shawn O. PearceMerge git://repo.or.cz/git-gui
2008-09-07  Junio C HamanoMerge updated git-gui and gitk that call each other
2008-09-06  Junio C HamanoMerge branch 'maint' of git://repo.or.cz/git-gui into...
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-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-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-15  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-07-06  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-06-27  Junio C HamanoMerge branch 'maint-1.5.4' into maint-1.5.5
2008-06-11  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-27  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-05-26  Junio C HamanoMerge branch 'maint-1.5.4' into maint
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-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-09  Junio C HamanoMerge branch 'fl/send-email-outside'
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
2008-04-02  Junio C HamanoMerge git://repo.or.cz/git-gui
2008-03-28  Junio C HamanoGIT 1.5.5-rc2 v1.5.5-rc2
2008-03-27  Junio C HamanoMerge branch 'maint'
2008-03-26  Junio C HamanoMerge branch 'jc/maint-fetch-regression-1.5.4'
2008-03-23  Junio C HamanoMerge branch 'git-p4' of git://repo.or.cz/git/git-p4
2008-03-17  Junio C HamanoMerge branch 'jc/makefile'
2008-03-16  Junio C HamanoMerge branch 'maint'
2008-03-16  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2008-03-15  Junio C HamanoRedo "add test_cmp function for test scripts"
2008-03-15  Junio C HamanoMerge branch 'jk/portable'
2008-03-15  Junio C HamanoMerge branch 'py/submodule'
2008-03-15  Junio C HamanoMerge branch 'db/diff-to-fp'
2008-03-15  Junio C HamanoMerge branch 'cc/help'
next