Andrew's git - gitweb.git/history

[gitweb.git] / t / t7600-merge.sh

2008-08-06	Merge branch 'maint'	blob \| diff \| raw
2008-08-03	Merge branch 'maint'	blob \| diff \| raw
2008-08-02	Merge branch 'maint'	blob \| diff \| raw
2008-08-02	Merge branch 'maint'	blob \| diff \| raw
2008-07-30	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-07-27	Merge git://repo.or.cz/git-gui	blob \| diff \| raw
2008-07-25	Merge branch 'maint'	blob \| diff \| raw
2008-07-24	Merge branch 'maint' into ph/checkout	blob \| diff \| raw
2008-07-21	Merge branch 'ap/trackinfo' v1.6.0-rc0	blob \| diff \| raw
2008-07-21	Merge branch 'jc/rerere-auto-more'	blob \| diff \| raw
2008-07-21	Merge branch 'ns/am-abort'	blob \| diff \| raw
2008-07-21	Merge branch 'jc/add-addremove'	blob \| diff \| raw
2008-07-21	Merge branch 'maint'	blob \| diff \| raw
2008-07-20	builtin-merge.c: Fix option parsing	blob \| diff \| raw
2008-07-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-07-18	Merge branch 'sp/maint-index-pack' into maint	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'mv/dashless'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'ls/mailinfo'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'sb/dashless'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'rs/archive'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'ag/blame'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'rs/rebase-checkout-not-so-quiet'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'sp/maint-index-pack'	blob \| diff \| raw \| diff to current
2008-07-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'js/maint-pretty-mailmap' into maint	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'sp/maint-bash-completion-optim' into...	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'sp/maint-pack-memuse' into maint	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'ls/maint-mailinfo-patch-label' into maint	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'js/maint-daemon-syslog' into maint	blob \| diff \| raw \| diff to current
2008-07-16	t7600-merge: Use test_expect_failure to test option...	blob \| diff \| raw \| diff to current
2008-07-16	Merge branch 'mv/merge-in-c'	blob \| diff \| raw \| diff to current
2008-07-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-07-14	reduce_heads(): protect from duplicate input	blob \| diff \| raw \| diff to current
2008-07-13	reduce_heads(): thinkofix	blob \| diff \| raw \| diff to current
2008-07-13	t/: Use "test_must_fail git" instead of "! git"	blob \| diff \| raw \| diff to current
2008-07-10	Teach merge.log to "git-merge" again	blob \| diff \| raw \| diff to current
2008-07-08	Merge branch 'jc/blame' (early part) into HEAD	blob \| diff \| raw \| diff to current
2008-07-08	Merge branch 'lt/racy-empty' into maint	blob \| diff \| raw \| diff to current
2008-07-06	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-06-27	Merge branch 'maint-1.5.5' into maint	blob \| diff \| raw \| diff to current
2008-06-27	Merge branch 'maint-1.5.4' into maint-1.5.5	blob \| diff \| raw \| diff to current
2008-06-25	Merge branch 'jc/maint-combine-diff-pre-context' into...	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'lt/racy-empty'	blob \| diff \| raw \| diff to current
2008-06-22	Merge branch 'jc/maint-combine-diff-pre-context'	blob \| diff \| raw \| diff to current
2008-06-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-11	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-06-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-09	Merge branch 'js/merge-recursive'	blob \| diff \| raw \| diff to current
2008-06-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-07	Merge 1.5.5.4 in	blob \| diff \| raw \| diff to current
2008-06-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-06-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-28	Merge 1.5.5.3 in	blob \| diff \| raw \| diff to current
2008-05-27	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-27	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-05-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-26	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'db/clone-in-c'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'ar/batch-cat'	blob \| diff \| raw \| diff to current
2008-05-25	Merge branch 'ap/svn'	blob \| diff \| raw \| diff to current
2008-05-24	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'pb/push'	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-23	Merge branch 'maint-1.5.4' into maint v1.5.5.2	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'sv/first-parent'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'np/pack'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'as/graph'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'jk/maint-send-email-compose'	blob \| diff \| raw \| diff to current
2008-05-21	Merge branch 'hb/maint-send-email-quote-recipients'	blob \| diff \| raw \| diff to current
2008-05-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-05-15	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'sb/committer'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'bd/tests'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'mv/format-cc'	blob \| diff \| raw \| diff to current
2008-05-14	Merge branch 'cc/hooks-doc'	blob \| diff \| raw \| diff to current
2008-05-12	Merge branch 'gp/bisect-fix'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'py/diff-submodule'	blob \| diff \| raw \| diff to current
2008-05-11	Merge branch 'lt/case-insensitive'	blob \| diff \| raw \| diff to current
2008-05-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-05-09	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-09	Merge branch 'sg/merge-options' (early part)	blob \| diff \| raw \| diff to current
2008-05-04	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-05-03	Merge commit 'sg/merge-options^' into jk/renamelimit	blob \| diff \| raw \| diff to current
2008-04-30	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-28	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-25	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-23	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-19	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-17	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-16	Merge branch 'maint-1.5.4' into maint	blob \| diff \| raw \| diff to current
2008-04-13	merge, pull: add '--(no-)log' command line option	blob \| diff \| raw \| diff to current
2008-04-13	merge, pull: introduce '--(no-)stat' option	blob \| diff \| raw \| diff to current
next