tests: document cherry-pick behavior in face of conflicts
[gitweb.git] / t / t0002-gitfile.sh
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'maint-1.5.5' into maint-1.5.6
2009-02-11 Merge branch 'js/maint-1.6.0-path-normalize'
2009-02-10 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'js/maint-remote-remove-mirror'
2009-02-06 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'sg/maint-gitdir-in-subdir' into maint
2009-02-06 Merge branch 'lt/maint-wrap-zlib' into maint
2009-02-06 Merge branch 'js/maint-all-implies-HEAD' into maint
2009-02-06 Merge branch 'kc/maint-diff-bwi-fix' into maint
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-03 Merge branch 'maint-1.6.0' into maint
2009-02-01 Merge branch 'ks/maint-mailinfo-folded'
2009-02-01 Merge branch 'maint-1.6.0' into maint
2009-01-29 Merge branch 'jc/maint-format-patch-o-relative' into...
2009-01-29 Merge branch 'bs/maint-rename-populate-filespec' into...
2009-01-29 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
2009-01-26 Merge branch 'js/maint-all-implies-HEAD'
2009-01-24 Merge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24 Merge branch 'jc/maint-format-patch' into maint
2009-01-24 Merge branch 'maint-1.6.0' into maint
2009-01-22 Merge branch 'kc/maint-diff-bwi-fix'
2009-01-22 Merge branch 'lt/maint-wrap-zlib'
2009-01-22 Merge branch 'sg/maint-gitdir-in-subdir'
2009-01-22 Merge branch 'jc/maint-format-patch-o-relative'
2009-01-21 Merge branch 'bs/maint-rename-populate-filespec'
2009-01-20 Merge branch 'kc/maint-diff-bwi-fix'
2009-01-18 Merge branch 'jc/maint-format-patch'
2009-01-18 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-14 Merge branch 'maint-1.6.0' into maint
2009-01-14 Merge branch 'js/bundle-tags'
2009-01-14 Merge branch 'cb/maint-unpack-trees-absense'
2009-01-13 Merge branch 'cb/maint-merge-recursive-fix' into maint
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-13 Merge branch 'maint-1.6.0' into maint
2009-01-12 Merge branch 'jc/maint-do-not-switch-to-non-commit...
2009-01-07 Merge branch 'maint-1.6.0' into maint
2009-01-07 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Merge branch 'jc/maint-do-not-switch-to-non-commit'
2009-01-03 Merge branch 'ap/maint-apply-modefix'
2008-12-27 Merge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Merge branch 'maint'
2008-12-22 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 Merge branch 'maint' to sync with GIT 1.6.0.6
2008-12-20 GIT 1.6.0.6 v1.6.0.6
2008-12-18 Merge git://repo.or.cz/git-gui
2008-12-17 GIT 1.5.6.6 v1.5.6.6
2008-12-16 Merge branch 'maint'
2008-12-15 Merge branch 'cb/maint-merge-recursive-fix' into cb...
2008-12-13 Merge branch 'maint'
2008-12-11 Merge branch 'maint'
2008-12-10 Merge branch 'maint'
2008-12-07 Merge branch 'maint'
2008-12-03 Merge branch 'maint'
2008-12-03 Merge branch 'maint'
2008-12-02 Merge git://repo.or.cz/git-gui
2008-12-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-01 Merge git://repo.or.cz/git-gui
2008-12-01 Merge branch 'maint'
2008-11-28 Merge branch 'js/mingw-rename-fix'
2008-11-28 Merge branch 'maint'
2008-11-27 Merge branch 'rw/maint-typofix' into rw/typofix
2008-11-26 Merge branch 'maint'
2008-11-26 Merge branch 'mm/maint-sort-config-doc' into mm/sort...
2008-11-24 Merge branch 'maint'
2008-11-17 Merge branch 'maint'
2008-11-16 Merge git://repo.or.cz/git-gui
2008-11-16 Merge branch 'maint'
2008-11-16 Merge branch 'bc/maint-keep-pack'
2008-11-15 Merge branch 'maint'
2008-11-14 Merge branch 'maint'
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge branch 'jk/maint-commit-v-strip'
2008-11-13 Merge branch 'mk/maint-cg-push'
2008-11-13 Merge branch 'bc/maint-keep-pack'
2008-11-13 Merge branch 'st/tag'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-12 Merge branch 'maint'
2008-11-12 Merge branch 'jk/maint-commit-v-strip' into jk/commit...
2008-11-11 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'maint'
2008-11-05 Merge branch 'mv/maint-branch-m-symref'
2008-11-04 Merge branch 'maint'
2008-11-03 Merge branch 'maint'
2008-11-03 Merge branch 'sh/rebase-i-p'
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Merge branch 'maint'
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-10-31 Merge branch 'maint'
2008-10-31 Merge branch 'ar/maint-mksnpath' into ar/mksnpath
2008-10-27 Merge branch 'ar/maint-mksnpath' into HEAD
2008-10-26 Merge branch 'maint'
next