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

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

projects / thirdparty / git.git / history

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

2016-06-28	brian m. carlson	merge-recursive: convert merge_recursive_generic()...	blob \| commitdiff \| raw
2016-06-10	Junio C Hamano	Merge branch 'jk/diff-compact-heuristic'	blob \| commitdiff \| raw \| diff to current
2016-06-06	Junio C Hamano	Merge branch 'ar/diff-args-osx-precompose' into maint	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'rs/apply-name-terminate'	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'rs/patch-id-use-skip-prefix'	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'pa/cherry-pick-doc-typo'	blob \| commitdiff \| raw \| diff to current
2016-06-03	Junio C Hamano	Merge branch 'js/rebase-i-dedup-call-to-rerere'	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'bn/http-cookiefile-config' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'jk/test-send-sh-x-trace-elsewhere' into...	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'js/name-rev-use-oldest-ref' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-31	Junio C Hamano	Merge branch 'jk/cat-file-buffered-batch-all'	blob \| commitdiff \| raw \| diff to current
2016-05-30	Junio C Hamano	Merge branch 'rj/log-decorate-auto'	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'sb/z-is-gnutar-ism' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'bn/config-doc-tt-varnames' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'nd/remote-plural-ours-plus-theirs' into...	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'ak/t4151-ls-files-could-be-empty' into...	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'jc/test-seq' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'tb/t5601-sed-fix' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-23	Junio C Hamano	Merge branch 'jc/rerere-multi'	blob \| commitdiff \| raw \| diff to current
2016-05-23	Junio C Hamano	Merge branch 'ar/diff-args-osx-precompose'	blob \| commitdiff \| raw \| diff to current
2016-05-23	Junio C Hamano	Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'sb/clean-test-fix' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'rn/glossary-typofix' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'jk/fix-attribute-macro-in-2.5' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'sk/gitweb-highlight-encoding' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'nf/mergetool-prompt' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'jd/send-email-to-whom' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-18	Junio C Hamano	Merge branch 'sb/mv-submodule-fix' into HEAD	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'jk/test-send-sh-x-trace-elsewhere'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'jc/ll-merge-internal'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'tb/t5601-sed-fix'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'jc/test-seq'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'ak/t4151-ls-files-could-be-empty'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'nd/remote-plural-ours-plus-theirs'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'bn/config-doc-tt-varnames'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'sb/z-is-gnutar-ism'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'jc/config-pathname-type'	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'bn/http-cookiefile-config'	blob \| commitdiff \| raw \| diff to current
2016-05-13	Junio C Hamano	Merge branch 'jc/commit-tree-ignore-commit-gpgsign'	blob \| commitdiff \| raw \| diff to current
2016-05-10	Junio C Hamano	Merge branch 'sk/gitweb-highlight-encoding'	blob \| commitdiff \| raw \| diff to current
2016-05-10	Junio C Hamano	Merge branch 'sb/clean-test-fix'	blob \| commitdiff \| raw \| diff to current
2016-05-10	Junio C Hamano	Merge branch 'rn/glossary-typofix'	blob \| commitdiff \| raw \| diff to current
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 \| diff to current
2016-05-06	Junio C Hamano	Merge branch 'ls/p4-lfs-test-fix-2.7.0'	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 'jk/fix-attribute-macro-in-2.5'	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-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 'es/format-patch-doc-hide-no-patch' into...	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 '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 '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-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 '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-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 'rj/xdiff-prepare-plug-leak-on-error-codep...	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 'ss/exc-flag-is-a-collection-of-bits'...	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-14	Junio C Hamano	Merge branch 'sb/submodule-helper-clone-regression...	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 'es/format-patch-doc-hide-no-patch'	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 'rt/rebase-i-shorten-stop-report'	blob \| commitdiff \| raw \| diff to current
2016-04-08	Junio C Hamano	Merge branch 'oa/doc-diff-check'	blob \| commitdiff \| raw \| diff to current
2016-04-08	Junio C Hamano	Merge branch 'pb/opt-cmdmode-doc'	blob \| commitdiff \| raw \| diff to current
2016-04-08	Junio C Hamano	Merge branch 'nd/apply-doc'	blob \| commitdiff \| raw \| diff to current
2016-04-06	Junio C Hamano	Merge branch 'ss/commit-squash-msg'	blob \| commitdiff \| raw \| diff to current
2016-04-06	Junio C Hamano	Merge branch 'pb/t7502-drop-dup'	blob \| commitdiff \| raw \| diff to current
2016-04-06	Junio C Hamano	Merge branch 'ss/exc-flag-is-a-collection-of-bits'	blob \| commitdiff \| raw \| diff to current
2016-04-03	Junio C Hamano	Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom