tests: document cherry-pick behavior in face of conflicts
[gitweb.git] / t / t9145-git-svn-master-branch.sh
2009-08-24 Merge branch 'ld/p4'
2009-08-22 Sync with 1.6.4.1
2009-08-22 Merge branch 'cc/replace'
2009-08-22 Merge branch 'gb/apply-ignore-whitespace'
2009-08-22 Merge branch 'bc/mailsplit-cr-at-eol'
2009-08-19 Merge branch 'rc/maint-http-fix'
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-18 Merge branch 'maint'
2009-08-16 Merge branch 'lt/block-sha1'
2009-08-16 Merge branch 'bc/maint-am-email'
2009-08-16 Merge branch 'js/maint-cover-letter-non-ascii'
2009-08-16 Merge branch 'jc/maint-clean-nested-dir-safety'
2009-08-16 Merge branch 'jk/maint-merge-msg-fix'
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-14 Merge branch 'jn/gitweb-blame' (early part)
2009-08-13 svn: initial "master" points to trunk if possible