checkout -m --conflict=diff3: add a label for ancestor
[gitweb.git] / t / t7505-prepare-commit-msg-hook.sh
2008-06-09 Merge branch 'maint'
2008-06-07 Merge 1.5.5.4 in
2008-06-06 Merge branch 'maint'
2008-06-04 Merge branch 'maint'
2008-05-28 Merge 1.5.5.3 in
2008-05-27 Merge branch 'maint'
2008-05-27 Merge git://repo.or.cz/git-gui
2008-05-26 Merge branch 'maint'
2008-05-26 Merge branch 'maint-1.5.4' into maint
2008-05-25 Merge branch 'js/config-cb' v1.5.6-rc0
2008-05-25 Merge branch 'db/clone-in-c'
2008-05-25 Merge branch 'ar/batch-cat'
2008-05-25 Merge branch 'ap/svn'
2008-05-24 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-23 Merge branch 'pb/push'
2008-05-23 Merge branch 'bc/repack'
2008-05-23 Merge branch 'sp/ignorecase'
2008-05-23 Merge branch 'maint'
2008-05-23 Merge branch 'maint-1.5.4' into maint v1.5.5.2
2008-05-21 Merge branch 'maint'
2008-05-21 Merge branch 'maint-1.5.4' into maint
2008-05-21 Merge branch 'ar/add-unreadable'
2008-05-21 Merge branch 'ds/branch-auto-rebase'
2008-05-21 Merge branch 'sv/first-parent'
2008-05-21 Merge branch 'np/pack'
2008-05-21 Merge branch 'as/graph'
2008-05-21 Merge branch 'jk/maint-send-email-compose'
2008-05-21 Merge branch 'hb/maint-send-email-quote-recipients'
2008-05-17 Merge branch 'maint'
2008-05-15 Merge git://repo.or.cz/git-gui
2008-05-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-05-14 Merge branch 'maint'
2008-05-14 Merge branch 'maint-1.5.4' into maint
2008-05-14 Merge branch 'sb/committer'
2008-05-14 Merge branch 'bd/tests'
2008-05-11 Merge branch 'maint-1.5.4' into maint
2008-05-09 Merge branch 'maint-1.5.4' into maint
2008-05-05 Fix tests breaking when checkout path contains shell...
2008-05-04 Merge branch 'maint-1.5.4' into maint
2008-04-30 Merge branch 'maint-1.5.4' into maint
2008-04-28 Merge branch 'maint-1.5.4' into maint
2008-04-25 Merge branch 'maint-1.5.4' into maint
2008-04-23 Merge branch 'maint-1.5.4' into maint
2008-04-19 Merge branch 'maint-1.5.4' into maint
2008-04-17 Merge branch 'maint-1.5.4' into maint
2008-04-16 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-12 Merge branch 'maint-1.5.4' into maint
2008-04-10 Merge branch 'maint-1.5.4' into maint
2008-04-09 Merge branch 'jc/rename'
2008-04-09 Merge branch 'mk/unpack-careful'
2008-04-09 Merge branch 'fl/send-email-outside'
2008-04-08 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-04-07 Merge branch 'jc/maint-apply-match-beginning'
2008-04-05 Merge git://repo.or.cz/git-gui
2008-04-02 Merge git://repo.or.cz/git-gui
2008-03-28 GIT 1.5.5-rc2 v1.5.5-rc2
2008-03-27 Merge branch 'maint'
2008-03-26 Merge branch 'jc/maint-fetch-regression-1.5.4'
2008-03-23 Merge branch 'git-p4' of git://repo.or.cz/git/git-p4
2008-03-17 Merge branch 'jc/makefile'
2008-03-16 Merge branch 'maint'
2008-03-16 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-15 Merge branch 'jk/portable'
2008-03-15 Merge branch 'maint'
2008-03-15 Merge branch 'maint'
2008-03-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-03-14 Merge branch 'maint'
2008-03-13 t7505: use SHELL_PATH in hook
2008-03-13 Merge branch 'maint'
2008-03-12 Merge git://repo.or.cz/git-gui
2008-03-12 Merge branch 'maint'
2008-03-11 Merge branch 'maint'
2008-03-09 Merge branch 'kb/maint-filter-branch-disappear'
2008-03-09 Merge branch 'maint' to sync with 1.5.4.4
2008-03-08 Merge branch 'aw/maint-shortlog-blank-lines'
2008-03-08 Merge branch 'maint'
2008-03-04 Merge branch 'maint'
2008-03-03 Merge branch 'maint'
2008-03-02 Merge branch 'pb/cvsimport'
2008-03-02 Merge branch 'jc/maint-log-merge-left-right'
2008-03-02 Merge branch 'mh/maint-http-proxy-fix'
2008-03-02 Merge branch 'mk/maint-parse-careful'
2008-03-02 Merge branch 'ew/maint-svn-cert-fileprovider'
2008-03-02 Merge branch 'js/maint-daemon'
2008-03-01 Merge branch 'master' of git://repo.or.cz/git-gui
2008-03-01 Merge branch 'maint'
2008-02-29 Merge branch 'maint'
2008-02-27 Merge branch 'maint'
2008-02-27 Merge branch 'js/branch-track'
2008-02-27 Merge branch 'db/checkout'
2008-02-27 Merge branch 'jc/diff-relative'
2008-02-26 Merge branch 'maint'
2008-02-25 Merge branch 'lt/dirstat'
2008-02-25 Merge branch 'jc/apply-whitespace'
2008-02-24 Merge branch 'maint'
2008-02-23 Sync with 1.5.4.3
2008-02-23 Merge branch 'bc/reflog-fix' into js/reflog-delete
2008-02-22 Merge branch 'maint'
2008-02-21 Merge branch 'js/maint-cvsexport'
next