git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - t/t6024-recursive-merge.sh

projects / thirdparty / git.git / history

[thirdparty/git.git] / t / t6024-recursive-merge.sh

2010-01-31	Junio C Hamano	Merge commit 'b319ef7' into jc/maint-fix-test-perm	blob \| commitdiff \| raw
2009-07-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-07-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-07-25	Junio C Hamano	Merge branch 'js/maint-graft-unhide-true-parents'	blob \| commitdiff \| raw
2009-07-25	Junio C Hamano	Merge branch 'av/maint-config-reader'	blob \| commitdiff \| raw
2009-07-25	Junio C Hamano	Merge branch 'jk/maint-send-email-alias-loop'	blob \| commitdiff \| raw
2009-07-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-07-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-07-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-07-11	Junio C Hamano	Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'	blob \| commitdiff \| raw
2009-07-09	Junio C Hamano	Merge branch 'ld/push-porcelain-output-format'	blob \| commitdiff \| raw
2009-07-09	Junio C Hamano	Merge branch 'gb/gitweb-avatar'	blob \| commitdiff \| raw
2009-07-09	Junio C Hamano	Merge branch 'ml/http'	blob \| commitdiff \| raw
2009-07-09	Junio C Hamano	Merge branch 'rs/grep-p'	blob \| commitdiff \| raw
2009-07-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-07-06	Junio C Hamano	Merge branch 'tr/die_errno'	blob \| commitdiff \| raw
2009-07-06	Junio C Hamano	Merge branch 'cb/maint-fetch-refspec-wo-dst'	blob \| commitdiff \| raw
2009-07-06	Junio C Hamano	Merge branch 'sb/show-ref-parse-options'	blob \| commitdiff \| raw
2009-07-06	Junio C Hamano	Merge branch 'gb/am-foreign'	blob \| commitdiff \| raw
2009-07-06	Junio C Hamano	Merge branch 'jk/use-our-regexp'	blob \| commitdiff \| raw
2009-07-06	Junio C Hamano	Merge branch 'uk/rev-parse-parse-opt'	blob \| commitdiff \| raw
2009-07-02	Martin Renold	Remove filename from conflict markers	blob \| commitdiff \| raw
2009-07-02	Junio C Hamano	Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'	blob \| commitdiff \| raw \| diff to current
2009-06-22	Junio C Hamano	Merge branch 'sb/maint-1.6.0-add-config-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'sb/maint-1.6.0-add-config-fix'	blob \| commitdiff \| raw \| diff to current
2009-06-20	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-06-14	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-06-11	Junio C Hamano	Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...	blob \| commitdiff \| raw \| diff to current
2009-06-02	Junio C Hamano	Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-26	Junio C Hamano	Merge branch 'jk/maint-1.6.0-trace-argv' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-24	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-05-23	Junio C Hamano	Merge branch 'jk/maint-1.6.0-trace-argv'	blob \| commitdiff \| raw \| diff to current
2009-05-14	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-05-09	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-05-06	Junio C Hamano	Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-06	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-03	Junio C Hamano	Merge branch 'lt/pack-object-memuse' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-03	Junio C Hamano	Merge branch 'jc/maint-1.6.0-keep-pack' into maint...	blob \| commitdiff \| raw \| diff to current
2009-05-03	Junio C Hamano	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...	blob \| commitdiff \| raw \| diff to current
2009-05-03	Junio C Hamano	Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...	blob \| commitdiff \| raw \| diff to current
2009-05-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2009-05-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-04-29	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-28	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-25	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'lt/pack-object-memuse'	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into...	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-12	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully...	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'jc/maint-1.6.0-keep-pack' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'js/maint-1.6.0-exec-path-env' into maint...	blob \| commitdiff \| raw \| diff to current
2009-04-08	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-08	Junio C Hamano	Merge branch 'bs/maint-1.6.0-tree-walk-prefix'	blob \| commitdiff \| raw \| diff to current
2009-04-05	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blame-s' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'js/maint-1.6.0-exec-path-env' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-04-02	Junio C Hamano	Merge branch 'jc/maint-1.6.0-keep-pack'	blob \| commitdiff \| raw \| diff to current
2009-03-30	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-03-30	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-03-28	Junio C Hamano	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'	blob \| commitdiff \| raw \| diff to current
2009-03-26	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blame-s'	blob \| commitdiff \| raw \| diff to current
2009-03-26	Junio C Hamano	Merge branch 'js/maint-1.6.0-exec-path-env'	blob \| commitdiff \| raw \| diff to current
2009-03-26	Junio C Hamano	Merge branch 'bc/maint-1.6.1-branch-deleted-was'	blob \| commitdiff \| raw \| diff to current
2009-03-24	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'tr/maint-1.6.0-send-email-irt' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'jc/maint-1.6.0-read-tree-overlay' into...	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'js/maint-1.6.0-path-normalize' into maint...	blob \| commitdiff \| raw \| diff to current
2009-03-22	Junio C Hamano	Merge branch 'jc/maint-1.6.0-pack-directory' into maint...	blob \| commitdiff \| raw \| diff to current
2009-03-18	Junio C Hamano	Merge branch 'jc/maint-1.6.0-read-tree-overlay'	blob \| commitdiff \| raw \| diff to current
2009-03-18	Junio C Hamano	Merge branch 'tr/maint-1.6.0-send-email-irt'	blob \| commitdiff \| raw \| diff to current
2009-03-13	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-03-13	Junio C Hamano	Merge branch 'en/maint-1.6.1-hash-object' into maint...	blob \| commitdiff \| raw \| diff to current
2009-03-13	Junio C Hamano	Merge branch 'js/maint-1.6.1-remote-remove-mirror'...	blob \| commitdiff \| raw \| diff to current
2009-03-13	Junio C Hamano	Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...	blob \| commitdiff \| raw \| diff to current
2009-03-11	Junio C Hamano	Merge branch 'fg/maint-exclude-bq' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-11	Junio C Hamano	Merge branch 'en/maint-hash-object' into maint	blob \| commitdiff \| raw \| diff to current
2009-03-11	Junio C Hamano	Merge branch 'jc/maint-1.6.0-keep-pack'	blob \| commitdiff \| raw \| diff to current
2009-03-05	Junio C Hamano	Merge branch 'en/maint-hash-object'	blob \| commitdiff \| raw \| diff to current
2009-03-05	Junio C Hamano	Merge branch 'jc/blame'	blob \| commitdiff \| raw \| diff to current
2009-03-05	Junio C Hamano	Merge branch 'fg/exclude-bq'	blob \| commitdiff \| raw \| diff to current
2009-03-02	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-03-01	Junio C Hamano	Merge branch 'jc/maint-1.6.0-pack-directory'	blob \| commitdiff \| raw \| diff to current
2009-02-28	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-02-28	Junio C Hamano	Merge branch 'cc/maint-1.6.0-bisect-fix'	blob \| commitdiff \| raw \| diff to current
2009-02-27	Junio C Hamano	Merge branch 'cc/maint-1.6.0-bisect-fix'	blob \| commitdiff \| raw \| diff to current
2009-02-25	Junio C Hamano	Merge branch 'jc/maint-1.6.0-pack-directory'	blob \| commitdiff \| raw \| diff to current
2009-02-12	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-02-11	Junio C Hamano	Merge branch 'maint-1.5.6' into maint	blob \| commitdiff \| raw \| diff to current
2009-02-11	Junio C Hamano	Merge branch 'maint-1.5.5' into maint-1.5.6	blob \| commitdiff \| raw \| diff to current
2009-02-11	Junio C Hamano	Merge branch 'maint-1.5.4' into maint-1.5.5	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom