projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'nd/remote-plural-ours-plus-theirs'
[git] / merge-recursive.c
2016-05-17  Junio C HamanoMerge branch 'nd/remote-plural-ours-plus-theirs' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'bn/config-doc-tt-varnames' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'va/i18n-misc-updates' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'sb/z-is-gnutar-ism' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'lp/typofixes' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'sb/submodule-deinit-all' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'jc/config-pathname-type' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'bn/http-cookiefile-config' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'ab/hooks' blob | commitdiff | raw
2016-05-17  Junio C HamanoMerge branch 'sb/submodule-init' blob | commitdiff | raw
2016-05-13  Junio C HamanoMerge branch 'sb/submodule-module-list-pathspec-fix' blob | commitdiff | raw
2016-05-13  Junio C HamanoMerge branch 'jc/commit-tree-ignore-commit-gpgsign' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'sk/gitweb-highlight-encoding' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'sb/clean-test-fix' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'ls/travis-submitting-patches' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'js/close-packs-before-gc' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'ew/normal-to-e' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'ls/p4-lfs' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'sb/misc-cleanups' blob | commitdiff | raw
2016-05-10  Junio C HamanoMerge branch 'ew/doc-split-pack-disables-bitmap' blob | commitdiff | raw
2016-05-06  Junio C HamanoSync with maint blob | commitdiff | raw
2016-05-06  Junio C HamanoMerge branch 'ky/imap-send-openssl-1.1.0' into maint blob | commitdiff | raw | diff to current
2016-05-06  Junio C HamanoMerge branch 'js/replace-edit-use-editor-configuration... blob | commitdiff | raw | diff to current
2016-05-06  Junio C HamanoMerge branch 'kn/for-each-tag-branch' into maint blob | commitdiff | raw | diff to current
2016-05-06  Junio C HamanoMerge branch 'jk/diff-compact-heuristic' blob | commitdiff | raw
2016-05-06  Junio C HamanoMerge branch 'ls/p4-lfs-test-fix-2.7.0' blob | commitdiff | raw
2016-05-06  Junio C HamanoMerge branch 'bc/object-id' blob | commitdiff | raw
2016-05-06  Junio C HamanoMerge branch 'bw/rebase-merge-entire-branch' blob | commitdiff | raw | diff to current
2016-05-06  Junio C HamanoMerge branch 'jc/drop-git-spec-in' blob | commitdiff | raw | diff to current
2016-05-06  Junio C HamanoMerge branch 'js/http-custom-headers' blob | commitdiff | raw | diff to current
2016-05-06  Junio C HamanoMerge branch 'sb/clone-shallow-passthru' blob | commitdiff | raw | diff to current
2016-05-06  Junio C HamanoMerge branch 'ld/p4-test-py3' blob | commitdiff | raw | diff to current
2016-05-06  Junio C HamanoMerge branch 'sb/config-exit-status-list' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoSync with maint blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'nf/mergetool-prompt' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'jd/send-email-to-whom' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'rt/string-list-lookup-cleanup' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'jk/fix-attribute-macro-in-2.5' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'sg/test-lib-simplify-expr-away' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'nd/remove-unused' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'js/name-rev-use-oldest-ref' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'jd/p4-jobs-in-commit' blob | commitdiff | raw | diff to current
2016-05-03  Junio C HamanoMerge branch 'en/merge-fixes' blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'jc/xstrfmt-null-with-prec-0' into maint blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'ew/send-email-drop-data-dumper' into... blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'ad/cygwin-wants-rename' into maint blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'jc/http-socks5h' into maint blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'ad/commit-have-m-option' into maint blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'sb/submodule-helper-clone-regression... blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'jk/branch-shortening-funny-symrefs' into... blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'es/format-patch-doc-hide-no-patch' into... blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'ky/branch-d-worktree' into maint blob | commitdiff | raw | diff to current
2016-05-02  Junio C HamanoMerge branch 'ew/send-email-readable-message-id' into... blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'ep/trace-doc-sample-fix' into maint blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'jc/makefile-redirection-stderr' into... blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'ak/use-hashmap-iter-first-in-submodule... blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'tb/blame-force-read-cache-to-workaround... blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'sk/send-pack-all-fix' into maint blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'sg/diff-multiple-identical-renames' into... blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'jc/merge-refuse-new-root' blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'jk/push-client-deadlock-fix' blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'js/replace-edit-use-editor-configuration' blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'sb/mv-submodule-fix' blob | commitdiff | raw | diff to current
2016-04-29  Junio C HamanoMerge branch 'da/user-useconfigonly' blob | commitdiff | raw | diff to current
2016-04-25  Junio C HamanoMerge branch 'jc/rerere-multi' blob | commitdiff | raw | diff to current
2016-04-22  Junio C HamanoMerge branch 'ad/cygwin-wants-rename' blob | commitdiff | raw | diff to current
2016-04-22  Junio C HamanoMerge branch 'jc/http-socks5h' blob | commitdiff | raw | diff to current
2016-04-22  Junio C HamanoMerge branch 'ky/imap-send-openssl-1.1.0' blob | commitdiff | raw | diff to current
2016-04-22  Junio C HamanoMerge branch 'jc/xstrfmt-null-with-prec-0' blob | commitdiff | raw | diff to current
2016-04-22  Junio C HamanoMerge branch 'ad/commit-have-m-option' blob | commitdiff | raw | diff to current
2016-04-22  Junio C HamanoMerge branch 'ew/send-email-drop-data-dumper' blob | commitdiff | raw | diff to current
2016-04-22  Junio C HamanoMerge branch 'ew/send-email-readable-message-id' blob | commitdiff | raw | diff to current
2016-04-22  Junio C HamanoMerge branch 'sb/submodule-helper-clone-regression... blob | commitdiff | raw | diff to current
2016-04-19  brian m. carlsonmatch-trees: convert shift_tree() and shift_tree_by... blob | commitdiff | raw | diff to current
2016-04-18  Junio C HamanoMerge branch 'jk/branch-shortening-funny-symrefs' blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'jv/merge-nothing-into-void' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'ss/commit-squash-msg' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'jk/send-email-rtrim-mailrc-alias' into... blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'da/mergetool-delete-delete-conflict'... blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'jk/getwholeline-getdelim-empty' into... blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codep... blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'jk/rev-parse-local-env-vars' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'jk/config-get-urlmatch' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'pb/t7502-drop-dup' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'jk/test-httpd-config-nosystem' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'sb/clone-t57-t56' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'jk/credential-cache-comment-exit' into... blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'ss/exc-flag-is-a-collection-of-bits'... blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'mp/upload-pack-use-embedded-args' into... blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'oa/doc-diff-check' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'pb/opt-cmdmode-doc' into maint blob | commitdiff | raw | diff to current
2016-04-15  Junio C HamanoMerge branch 'nd/apply-doc' into maint blob | commitdiff | raw | diff to current
2016-04-14  Junio C HamanoMerge branch 'sb/submodule-path-misc-bugs' into sb... blob | commitdiff | raw | diff to current
2016-04-14  Junio C HamanoMerge branch 'sb/submodule-helper-clone-regression... blob | commitdiff | raw | diff to current
2016-04-13  Junio C HamanoMerge branch 'tb/blame-force-read-cache-to-workaround... blob | commitdiff | raw | diff to current
2016-04-13  Junio C HamanoMerge branch 'mg/complete-cherry-mark-to-log' blob | commitdiff | raw | diff to current
2016-04-13  Junio C HamanoMerge branch 'ep/trace-doc-sample-fix' blob | commitdiff | raw | diff to current
2016-04-13  Junio C HamanoMerge branch 'jc/makefile-redirection-stderr' blob | commitdiff | raw | diff to current
2016-04-13  Junio C HamanoMerge branch 'lt/pretty-expand-tabs' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.