octopus: reenable fast-forward merges
[git/git.git] / t / t7602-merge-octopus-many.sh
2009-12-14 Stephen Boydoctopus: reenable fast-forward merges
2009-12-14 Stephen Boydoctopus: make merge process simpler to follow
2009-09-21 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-28 Junio C HamanoMerge branch 'maint-1.5.6' into maint-1.6.0
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-03 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
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-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully...
2009-04-09 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1
2009-04-02 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s' into maint
2009-03-28 Junio C HamanoMerge branch 'jc/maint-1.6.0-diff-borrow-carefully'
2009-03-26 Junio C HamanoMerge branch 'jc/maint-1.6.0-blame-s'
2009-03-22 Junio C HamanoMerge branch 'jc/maint-1.6.0-read-tree-overlay' into...
2009-03-18 Junio C HamanoMerge branch 'jc/maint-1.6.0-read-tree-overlay'
2009-03-02 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2009-02-11 Junio C HamanoMerge branch 'maint-1.5.6' into maint
2009-01-24 Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-14 Junio C HamanoMerge branch 'cb/maint-unpack-trees-absense'
2009-01-13 Junio C HamanoMerge branch 'ap/maint-apply-modefix' into maint
2009-01-07 Junio C HamanoMerge branch 'maint-1.5.6' into maint-1.6.0
2009-01-03 Junio C HamanoMerge branch 'ap/maint-apply-modefix'
2008-12-27 Junio C HamanoMerge branch 'sp/maint-describe-all-tag-warning' into...
2008-12-22 Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2008-12-20 Junio C HamanoGIT 1.6.0.6 v1.6.0.6
2008-12-18 Junio C HamanoMerge git://repo.or.cz/git-gui
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-10-09 Shawn O. PearceMerge branch 'lt/time-reject-fractional-seconds'
2008-10-09 Shawn O. PearceMerge branch 'jc/add-ita'
2008-09-29 Shawn O. PearceMerge branch 'jc/better-conflict-resolution'
2008-09-25 Shawn O. PearceMerge branch 'mv/merge-recursive'
2008-09-25 Shawn O. PearceMerge git://repo.or.cz/git-gui
2008-09-19 Junio C HamanoMerge branch 'jc/diff-prefix'
2008-09-19 Junio C HamanoMerge branch 'np/pack'
2008-09-19 Junio C HamanoMerge branch 'tr/rev-list-reverse'
2008-09-19 Junio C HamanoMerge branch 'cc/bisect'
2008-09-19 Junio C HamanoMerge branch 'jc/maint-name-hash-clear' into maint
2008-09-16 Junio C HamanoMerge branch 'jc/maint-name-hash-clear'
2008-09-10 Junio C HamanoMerge branch 'jc/maint-hide-cr-in-diff-from-less' into...
2008-09-10 Junio C HamanoMerge branch 'jc/maint-checkout-fix' into maint
2008-09-10 Junio C HamanoMerge branch 'np/maint-safer-pack' into maint
2008-09-08 Junio C HamanoMerge branch 'ar/autospell'
2008-09-08 Junio C HamanoMerge branch 'jc/cc-ld-dynpath'
2008-09-08 Junio C HamanoMerge branch 'jc/hide-cr-in-diff-from-less'
2008-09-08 Junio C HamanoMerge branch 'jc/maint-checkout-fix'
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-09-03 Junio C HamanoMerge branch 'maint'
2008-09-03 Junio C HamanoMerge branch 'nd/worktree' into maint
2008-09-03 Junio C HamanoMerge branch 'ho/dashless' into maint
2008-09-03 Nanako Shiraishitests: use "git xyzzy" form (t7200 - t9001)
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-14 Junio C HamanoMerge branch 'maint'
2008-08-13 Junio C HamanoMerge branch 'maint'
2008-08-12 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-11 Junio C HamanoMerge branch 'maint'
2008-08-09 Junio C HamanoMerge branch 'maint'
2008-08-06 Junio C HamanoSync with 1.5.6.5
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-08-06 Junio C HamanoMerge branch 'maint'
2008-08-03 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
2008-08-02 Junio C HamanoMerge branch 'maint'
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-25 Junio C HamanoMerge branch 'maint'
2008-07-24 Junio C HamanoMerge branch 'maint' into ph/checkout
2008-07-21 Junio C HamanoMerge branch 'maint'
2008-07-19 Junio C HamanoMerge branch 'maint'
2008-07-17 Junio C HamanoMerge branch 'mv/dashless'
2008-07-17 Junio C HamanoMerge branch 'ls/mailinfo'
2008-07-17 Junio C HamanoMerge branch 'sb/dashless'
2008-07-17 Junio C HamanoMerge branch 'rs/archive'
2008-07-17 Junio C HamanoMerge branch 'ag/blame'
2008-07-17 Junio C HamanoMerge branch 'rs/rebase-checkout-not-so-quiet'
2008-07-17 Junio C HamanoMerge branch 'sp/maint-index-pack'
2008-07-17 Junio C HamanoMerge branch 'maint'
2008-07-16 Junio C HamanoMerge branch 'mv/merge-in-c'
2008-07-08 Miklos VajnaBuild in merge
2008-07-01 Miklos VajnaAdd new test to ensure git-merge handles more than...