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

2016-05-13	Junio C Hamano	Merge branch 'sb/submodule-module-list-pathspec-fix'	blob \| commitdiff \| raw
2016-05-13	Junio C Hamano	Merge branch 'jc/commit-tree-ignore-commit-gpgsign'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'sk/gitweb-highlight-encoding'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'sb/clean-test-fix'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'rn/glossary-typofix'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'ls/travis-submitting-patches'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'js/close-packs-before-gc'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'ew/normal-to-e'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'ls/p4-lfs'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'sb/misc-cleanups'	blob \| commitdiff \| raw
2016-05-10	Junio C Hamano	Merge branch 'ew/doc-split-pack-disables-bitmap'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'ky/imap-send-openssl-1.1.0' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'js/replace-edit-use-editor-configuration...	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'kn/for-each-tag-branch' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'jk/diff-compact-heuristic'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'ls/p4-lfs-test-fix-2.7.0'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'bc/object-id'	blob \| commitdiff \| raw
2016-05-06	Junio C Hamano	Merge branch 'bw/rebase-merge-entire-branch'	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'jc/drop-git-spec-in'	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'js/http-custom-headers'	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'sb/clone-shallow-passthru'	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'ld/p4-test-py3'	blob \| commitdiff \| raw \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'sb/config-exit-status-list'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'nf/mergetool-prompt'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'jd/send-email-to-whom'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'rt/string-list-lookup-cleanup'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'jk/fix-attribute-macro-in-2.5'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'sg/test-lib-simplify-expr-away'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'nd/remove-unused'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'js/name-rev-use-oldest-ref'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'jd/p4-jobs-in-commit'	blob \| commitdiff \| raw \| diff to current
2016-05-03	Junio C Hamano	Merge branch 'en/merge-fixes'	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'jc/xstrfmt-null-with-prec-0' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'ew/send-email-drop-data-dumper' into...	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'ad/cygwin-wants-rename' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'jc/http-socks5h' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'ad/commit-have-m-option' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'sb/submodule-helper-clone-regression...	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'jk/branch-shortening-funny-symrefs' into...	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'es/format-patch-doc-hide-no-patch' into...	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'ky/branch-d-worktree' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-02	Junio C Hamano	Merge branch 'ew/send-email-readable-message-id' into...	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'ep/trace-doc-sample-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'jc/makefile-redirection-stderr' into...	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'ak/use-hashmap-iter-first-in-submodule...	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'tb/blame-force-read-cache-to-workaround...	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'sk/send-pack-all-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'sg/diff-multiple-identical-renames' into...	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'jc/merge-refuse-new-root'	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'jk/push-client-deadlock-fix'	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'js/replace-edit-use-editor-configuration'	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'sb/mv-submodule-fix'	blob \| commitdiff \| raw \| diff to current
2016-04-29	Junio C Hamano	Merge branch 'da/user-useconfigonly'	blob \| commitdiff \| raw \| diff to current
2016-04-25	Junio C Hamano	Merge branch 'jc/rerere-multi'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'ad/cygwin-wants-rename'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'jc/http-socks5h'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'ky/imap-send-openssl-1.1.0'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'jc/xstrfmt-null-with-prec-0'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'ad/commit-have-m-option'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'ew/send-email-drop-data-dumper'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'ew/send-email-readable-message-id'	blob \| commitdiff \| raw \| diff to current
2016-04-22	Junio C Hamano	Merge branch 'sb/submodule-helper-clone-regression...	blob \| commitdiff \| raw \| diff to current
2016-04-19	brian m. carlson	match-trees: convert shift_tree() and shift_tree_by...	blob \| commitdiff \| raw \| diff to current
2016-04-18	Junio C Hamano	Merge branch 'jk/branch-shortening-funny-symrefs'	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'jv/merge-nothing-into-void' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'ss/commit-squash-msg' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'jk/send-email-rtrim-mailrc-alias' into...	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'da/mergetool-delete-delete-conflict'...	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'jk/getwholeline-getdelim-empty' into...	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'jk/rev-parse-local-env-vars' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'jk/config-get-urlmatch' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'pb/t7502-drop-dup' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'jk/test-httpd-config-nosystem' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'sb/clone-t57-t56' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'jk/credential-cache-comment-exit' into...	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'ss/exc-flag-is-a-collection-of-bits'...	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'mp/upload-pack-use-embedded-args' into...	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'oa/doc-diff-check' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'pb/opt-cmdmode-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-15	Junio C Hamano	Merge branch 'nd/apply-doc' into maint	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'tb/blame-force-read-cache-to-workaround...	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'mg/complete-cherry-mark-to-log'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'ep/trace-doc-sample-fix'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'jc/makefile-redirection-stderr'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'lt/pretty-expand-tabs'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'es/format-patch-doc-hide-no-patch'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'sb/misc-cleanups'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'sk/send-pack-all-fix'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'sg/diff-multiple-identical-renames'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'kn/for-each-tag-branch'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'ky/branch-d-worktree'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'rt/rebase-i-shorten-stop-report'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'rt/completion-help'	blob \| commitdiff \| raw \| diff to current
2016-04-13	Junio C Hamano	Merge branch 'ak/use-hashmap-iter-first-in-submodule...	blob \| commitdiff \| raw \| diff to current
2016-04-13	Elijah Newren	merge-recursive: do not check working copy when creatin...	blob \| commitdiff \| raw \| diff to current
2016-04-13	Elijah Newren	merge-recursive: remove duplicate code	blob \| commitdiff \| raw \| diff to current
2016-04-08	Junio C Hamano	Merge branch 'oa/doc-diff-check'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom