git.oblomov.eu Git - git/history - t/t7405-submodule-merge.sh

2009-09-01	Junio C Hamano	Merge branch 'tf/diff-whitespace-incomplete-line'	blob \| commitdiff \| raw
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-08-21	Junio C Hamano	Merge branch 'jc/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw
2009-08-16	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-08-11	Junio C Hamano	Merge branch 'jc/maint-merge-recursive-fix'	blob \| commitdiff \| raw
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-07-29	Junio C Hamano	Merge branch 'hv/cvsps-tests'	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
2009-06-22	Junio C Hamano	Merge branch 'sb/maint-1.6.0-add-config-fix' into maint	blob \| commitdiff \| raw
2009-06-22	Junio C Hamano	Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint	blob \| commitdiff \| raw
2009-06-21	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-06-21	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-06-21	Junio C Hamano	Merge branch 'ph/submodule-rebase'	blob \| commitdiff \| raw
2009-06-21	Junio C Hamano	Merge branch 'pb/maint-1.6.2-userdiff-fix'	blob \| commitdiff \| raw
2009-06-21	Junio C Hamano	Merge branch 'sb/maint-1.6.0-add-config-fix'	blob \| commitdiff \| raw
2009-06-20	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-06-14	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-06-14	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-06-13	Junio C Hamano	Merge branch 'ph/submodule-rebase' (early part)	blob \| commitdiff \| raw
2009-06-11	Junio C Hamano	Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...	blob \| commitdiff \| raw
2009-06-02	Junio C Hamano	Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint	blob \| commitdiff \| raw
2009-06-02	Junio C Hamano	Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...	blob \| commitdiff \| raw
2009-05-31	Junio C Hamano	Merge branch 'mw/send-email'	blob \| commitdiff \| raw
2009-05-29	Junio C Hamano	Merge branch 'sb/maint-1.6.2-opt-filename-fix'	blob \| commitdiff \| raw
2009-05-26	Junio C Hamano	Merge branch 'js/maint-no-ln-across-libexec-and-bin...	blob \| commitdiff \| raw
2009-05-26	Junio C Hamano	Merge branch 'lt/maint-diff-reduce-lstat' into maint	blob \| commitdiff \| raw
2009-05-26	Junio C Hamano	Merge branch 'do/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw
2009-05-26	Junio C Hamano	Merge branch 'jk/maint-1.6.0-trace-argv' into maint	blob \| commitdiff \| raw
2009-05-25	Junio C Hamano	Merge branch 'master' into sb/opt-filename	blob \| commitdiff \| raw
2009-05-24	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-05-24	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-05-23	Junio C Hamano	Merge branch 'mg/track'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'js/maint-no-ln-across-libexec-and-bin'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'lt/maint-diff-reduce-lstat'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'do/maint-merge-recursive-fix'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'jk/maint-1.6.0-trace-argv'	blob \| commitdiff \| raw
2009-05-23	Junio C Hamano	Merge branch 'mh/show-branch-color' into sb/show-branch...	blob \| commitdiff \| raw
2009-05-18	Junio C Hamano	Merge branch 'js/add-edit'	blob \| commitdiff \| raw
2009-05-18	Junio C Hamano	Merge branch 'mh/diff-stat-color'	blob \| commitdiff \| raw
2009-05-18	Junio C Hamano	Merge branch 'mh/show-branch-color'	blob \| commitdiff \| raw
2009-05-18	Junio C Hamano	Merge branch 'ac/graph-horizontal-line'	blob \| commitdiff \| raw
2009-05-18	Junio C Hamano	Merge branch 'ae/anon-fetch-info'	blob \| commitdiff \| raw
2009-05-16	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-05-14	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-05-12	Junio C Hamano	Merge branch 'maint-1.6.2' into maint	blob \| commitdiff \| raw
2009-05-09	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-05-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
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	Sync with GIT 1.6.2.5	blob \| commitdiff \| raw
2009-05-03	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-05-03	Junio C Hamano	Merge branch 'mm/maint-add-p-quit' 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-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2009-05-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-04-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-04-29	Junio C Hamano	merge-recursive: do not die on a conflicting submodule	blob \| commitdiff \| raw
2009-04-29	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-28	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-25	Junio C Hamano	Merge branch 'maint-1.6.1' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-20	Junio C Hamano	Merge branch 'mm/maint-add-p-quit'	blob \| commitdiff \| raw \| diff to current
2009-04-19	Junio C Hamano	Merge branch 'ef/maint-fast-export' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-19	Junio C Hamano	Merge branch 'mm/maint-add-p-quit' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-19	Junio C Hamano	Merge branch 'lt/maint-reflog-expire' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-19	Junio C Hamano	Merge branch 'jc/maint-shared-literally' into maint	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.1' into maint	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 'js/maint-submodule-checkout' into maint	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-submodule-fix...	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'da/difftool'	blob \| commitdiff \| raw \| diff to current
2009-04-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-04-13	Junio C Hamano	Mark t1301 permission test to depend on POSIXPERM	blob \| commitdiff \| raw \| diff to current
2009-04-12	Junio C Hamano	Merge branch 'sb/doc-upstream-branch'	blob \| commitdiff \| raw \| diff to current
2009-04-12	Junio C Hamano	Merge branch 'jk/show-upstream'	blob \| commitdiff \| raw \| diff to current
2009-04-12	Junio C Hamano	Merge branch 'fg/remote-prune'	blob \| commitdiff \| raw \| diff to current
2009-04-12	Junio C Hamano	Merge branch 'cc/sha1-bsearch'	blob \| commitdiff \| raw \| diff to current
2009-04-12	Junio C Hamano	Merge branch 'cc/bisect-filter'	blob \| commitdiff \| raw \| diff to current
2009-04-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-04-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-04-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-04-08	Junio C Hamano	Merge branch 'lt/reflog-expire'	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-08	Junio C Hamano	Merge branch 'ms/http-auth'	blob \| commitdiff \| raw \| diff to current
2009-04-08	Junio C Hamano	Merge branch 'js/maint-submodule-checkout'	blob \| commitdiff \| raw \| diff to current
2009-04-08	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-submodule-fix'	blob \| commitdiff \| raw \| diff to current
2009-04-05	Clemens Buchacher	update cache for conflicting submodule entries	blob \| commitdiff \| raw \| diff to current
2009-04-05	Clemens Buchacher	add tests for merging with submodules	blob \| commitdiff \| raw \| diff to current

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

RSS Atom