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

]> git.ipfire.org Git - thirdparty/git.git/history - merge-recursive.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / merge-recursive.c

2012-08-17	Junio C Hamano	Merge branch 'jc/doc-git-updates' (early part)	blob \| commitdiff \| raw
2012-08-15	Junio C Hamano	Sync with 1.7.11.5	blob \| commitdiff \| raw
2012-08-15	Junio C Hamano	Merge branch 'rj/maint-grep-remove-redundant-test'...	blob \| commitdiff \| raw \| diff to current
2012-08-15	Junio C Hamano	Merge branch 'hv/link-alt-odb-entry' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-08	Junio C Hamano	Merge branch 'bw/maint-1.7.9-solaris-getpass'	blob \| commitdiff \| raw
2012-08-06	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2012-08-06	Junio C Hamano	Merge branch 'jn/block-sha1' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'jn/make-assembly-in-right-directory'...	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'ms/daemon-doc-typo' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'lm/git-blame-el' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'rs/git-blame-mapcar-mapc' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'rr/doc-commit' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'jk/maint-checkout-orphan-check-fix' into...	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge git://github.com/git-l10n/git-po	blob \| commitdiff \| raw
2012-08-05	Ralf Thielow	merge-recursive: separate message for common ancestors	blob \| commitdiff \| raw
2012-08-01	Junio C Hamano	Merge git://github.com/git-l10n/git-po	blob \| commitdiff \| raw \| diff to current
2012-07-31	Junio C Hamano	Merge branch 'nd/maint-i18n-diffstat'	blob \| commitdiff \| raw \| diff to current
2012-07-31	Junio C Hamano	Merge branch 'jx/i18n-1.7.11'	blob \| commitdiff \| raw \| diff to current
2012-07-30	Junio C Hamano	Merge branch 'jk/maint-advise-vaddf' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-30	Junio C Hamano	Merge branch 'jv/maint-no-ext-diff' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-30	Junio C Hamano	Merge branch 'pg/maint-1.7.9-am-where-is-patch' into...	blob \| commitdiff \| raw \| diff to current
2012-07-30	Junio C Hamano	Merge branch 'jc/maint-filter-branch-epoch-date' into...	blob \| commitdiff \| raw \| diff to current
2012-07-30	Junio C Hamano	Merge branch 'rj/maint-grep-remove-redundant-test'	blob \| commitdiff \| raw \| diff to current
2012-07-30	Junio C Hamano	Merge branch 'hv/link-alt-odb-entry'	blob \| commitdiff \| raw \| diff to current
2012-07-28	Junio C Hamano	Merge branch 'jk/maint-checkout-orphan-check-fix'	blob \| commitdiff \| raw \| diff to current
2012-07-27	Jiang Xin	i18n: merge-recursive: mark strings for translation	blob \| commitdiff \| raw \| diff to current
2012-07-24	Junio C Hamano	Merge branch 'jk/maint-commit-check-committer-early'	blob \| commitdiff \| raw \| diff to current
2012-07-24	Junio C Hamano	Merge branch 'jk/maint-advise-vaddf'	blob \| commitdiff \| raw \| diff to current
2012-07-24	Junio C Hamano	Merge branch 'jn/block-sha1'	blob \| commitdiff \| raw \| diff to current
2012-07-24	Junio C Hamano	Merge branch 'jn/make-assembly-in-right-directory'	blob \| commitdiff \| raw \| diff to current
2012-07-24	Junio C Hamano	Merge branch 'jv/maint-no-ext-diff'	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'ar/clone-honor-umask-at-top' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'cw/amend-commit-without-message' into...	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'...	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'tr/maint-show-walk' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'jc/refactor-diff-stdin' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'mz/empty-rebase-test' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'js/fast-export-paths-with-spaces' into...	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'cw/no-detaching-an-unborn' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'pg/maint-1.7.9-am-where-is-patch'	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'ms/daemon-doc-typo'	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'jc/sha1-name-more'	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'jc/maint-filter-branch-epoch-date'	blob \| commitdiff \| raw \| diff to current
2012-07-17	Junio C Hamano	Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint...	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare'	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'cw/amend-commit-without-message'	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'ar/clone-honor-umask-at-top'	blob \| commitdiff \| raw \| diff to current
2012-07-13	Junio C Hamano	Merge branch 'jc/refactor-diff-stdin'	blob \| commitdiff \| raw \| diff to current
2012-07-13	Junio C Hamano	Merge branch 'jn/vcs-svn'	blob \| commitdiff \| raw \| diff to current
2012-07-13	Junio C Hamano	Merge branch 'tr/maint-show-walk'	blob \| commitdiff \| raw \| diff to current
2012-07-11	Junio C Hamano	Merge branch 'jc/maint-blame-unique-abbrev' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-11	Junio C Hamano	Merge branch 'mm/verify-filename-fix' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-11	Junio C Hamano	Merge branch 'cn/cherry-pick-range-docs' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-11	Junio C Hamano	Merge branch 'jc/ls-files-i-dir' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-11	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into tg...	blob \| commitdiff \| raw \| diff to current
2012-07-09	Junio C Hamano	Merge branch 'mz/empty-rebase-test'	blob \| commitdiff \| raw \| diff to current
2012-07-09	Junio C Hamano	Merge branch 'js/fast-export-paths-with-spaces'	blob \| commitdiff \| raw \| diff to current
2012-07-09	Junio C Hamano	Merge branch 'cw/no-detaching-an-unborn'	blob \| commitdiff \| raw \| diff to current
2012-07-09	Junio C Hamano	Merge branch 'jc/maint-blame-unique-abbrev'	blob \| commitdiff \| raw \| diff to current
2012-07-05	Junio C Hamano	Merge branch 'hv/remote-end-hung-up'	blob \| commitdiff \| raw \| diff to current
2012-06-28	Junio C Hamano	Merge branch 'mm/verify-filename-fix'	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch'	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'cn/cherry-pick-range-docs'	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'lm/git-blame-el'	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'rs/git-blame-mapcar-mapc'	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'rr/doc-commit'	blob \| commitdiff \| raw \| diff to current
2012-06-21	Junio C Hamano	Merge branch 'jk/maint-t1304-setfacl'	blob \| commitdiff \| raw \| diff to current
2012-06-21	Junio C Hamano	Merge branch 'jc/ls-files-i-dir'	blob \| commitdiff \| raw \| diff to current
2012-06-17	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error' into...	blob \| commitdiff \| raw \| diff to current
2012-06-12	Junio C Hamano	Merge branch 'jc/fmt-merge-msg-people'	blob \| commitdiff \| raw \| diff to current
2012-06-12	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error'	blob \| commitdiff \| raw \| diff to current
2012-06-07	Junio C Hamano	Merge branch 'rr/maint-t3510-cascade-fix'	blob \| commitdiff \| raw \| diff to current
2012-06-03	Junio C Hamano	Merge branch 'ef/maint-rebase-error-message' into maint	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'ef/maint-rebase-error-message'	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'nh/empty-rebase'	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'ef/http-o-depends-on-gvf' into maint	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'rs/maint-grep-F' into maint	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'jk/ident-split-fix' into maint	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'jk/pretty-commit-header-incomplete-line...	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'jk/format-person-part-buffer-limit' into...	blob \| commitdiff \| raw \| diff to current
2012-05-29	Junio C Hamano	Merge branch 'va/git-p4-test'	blob \| commitdiff \| raw \| diff to current
2012-05-29	Junio C Hamano	Merge branch 'mh/fetch-pack-constness'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'sp/sh-windows-pwd'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'mh/test-keep-prove-cache'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'jk/format-person-part-buffer-limit'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'jk/pretty-commit-header-incomplete-line'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'jk/ident-split-fix'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'rs/xdiff-fast-hash-fix'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'mh/ref-api'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'rs/maint-grep-F'	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'hv/submodule-alt-odb' into maint	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'bp/diff-no-index-strbuf-fix' into maint	blob \| commitdiff \| raw \| diff to current
2012-05-25	Junio C Hamano	Merge branch 'jk/maint-status-porcelain-z-b' into maint	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'rs/archive-tree-in-tip-simplify'	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'js/rev-parse-doc-fix'	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'js/rebase-i-p-test-fix'	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'bp/diff-no-index-strbuf-fix'	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'hv/submodule-alt-odb'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom