Merge git://repo.or.cz/git-gui
[gitweb.git] / t / t3504-cherry-pick-rerere.sh
2008-08-31 Merge branch 'maint'
2008-08-30 Merge branch 'sb/daemon'
2008-08-29 Merge branch 'maint'
2008-08-28 Merge branch 'mv/merge-custom'
2008-08-28 Merge branch 'ml/submodule'
2008-08-27 Merge branch 'am/cherry-pick-rerere'
2008-08-11 Make cherry-pick use rerere for conflict resolution.