git.oblomov.eu Git - git/history - builtin/merge-recursive.c

2018-08-15	Junio C Hamano	Merge branch 'jk/core-use-replace-refs'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'jh/json-writer'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'bb/make-developer-pedantic'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'es/diff-color-moved-fix'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'bw/protocol-v2'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sg/travis-cocci-diagnose-failure'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'js/t7406-recursive-submodule-update-order...	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'bw/fetch-pack-i18n'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sg/fast-import-dump-refs-on-checkpoint...	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sb/trailers-docfix'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'jk/ui-color-always-to-auto'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'jt/commit-graph-per-object-store'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'es/chain-lint-in-subshell'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'jt/tags-to-promised-blobs-fix'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'jt/fetch-negotiator-skipping'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'jm/send-email-tls-auth-on-batch'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'bc/sequencer-export-work-tree-as-well'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'en/t7405-recursive-submodule-conflicts'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'en/t6036-merge-recursive-tests'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'en/dirty-merge-fixes'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'js/rebase-merge-octopus'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'tb/grep-only-matching'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'kg/gc-auto-windows-workaround'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'jm/cache-entry-from-mem-pool'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'jt/fetch-nego-tip'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'en/t6042-insane-merge-rename-testcases'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'sb/object-store-lookup'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'is/parsing-line-range'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'jt/fetch-pack-negotiator'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'ab/checkout-default-remote'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'sb/diff-color-move-more'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'es/test-fixes'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'ds/commit-graph-fsck'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'jk/fsck-gitmodules-gently'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'bc/object-id'	blob \| commitdiff \| raw
2018-07-16	brian m. carlson	builtin/merge-recursive: make hash independent	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| commitdiff \| raw \| diff to current
2018-04-25	Junio C Hamano	Merge branch 'js/t5404-path-fix'	blob \| commitdiff \| raw \| diff to current
2018-04-25	Junio C Hamano	Merge branch 'mn/send-email-credential-doc'	blob \| commitdiff \| raw \| diff to current
2018-04-25	Junio C Hamano	Merge branch 'ak/bisect-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'sb/status-doc-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'cl/t9001-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-22	Junio C Hamano	Merge branch 'nd/diff-flush-before-warning' into maint	blob \| commitdiff \| raw \| diff to current
2018-03-21	Junio C Hamano	Merge branch 'dp/merge-strategy-doc-fix'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'mk/doc-pretty-fill'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'cb/ttk-style' of git-gui into cb/git...	blob \| commitdiff \| raw \| diff to current
2018-03-02	Junio C Hamano	Merge branch 'bb/ssh-key-files' of git-gui into bb...	blob \| commitdiff \| raw \| diff to current
2018-03-02	Junio C Hamano	Merge branch 'bp/bind-kp-enter' of git-gui into bp...	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'tz/do-not-clean-spec-file'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'sb/status-doc-fix'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'bp/name-hash-dirname-fix'	blob \| commitdiff \| raw \| diff to current
2018-02-15	Junio C Hamano	Merge branch 'as/read-tree-prefix-doc-fix' into maint	blob \| commitdiff \| raw \| diff to current
2018-02-13	Junio C Hamano	Merge branch 'nd/diff-flush-before-warning'	blob \| commitdiff \| raw \| diff to current
2018-02-13	Junio C Hamano	Merge branch 'cl/t9001-cleanup'	blob \| commitdiff \| raw \| diff to current
2018-01-23	Junio C Hamano	Merge branch 'as/read-tree-prefix-doc-fix'	blob \| commitdiff \| raw \| diff to current
2018-01-09	Junio C Hamano	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	blob \| commitdiff \| raw \| diff to current
2017-12-28	Junio C Hamano	Merge branch 'sr/http-sslverify-config-doc'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'es/clone-shared-worktree'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'jk/cvsimport-quoting'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'rs/am-builtin-leakfix'	blob \| commitdiff \| raw \| diff to current
2017-12-05	Junio C Hamano	Merge branch 'ls/no-double-utf8-author-name' of .....	blob \| commitdiff \| raw \| diff to current
2017-11-22	Junio C Hamano	Merge branch 'jn/reproducible-build' of ../git-gui...	blob \| commitdiff \| raw \| diff to current
2017-11-09	Junio C Hamano	Merge branch 'tz/fsf-address-update' of ../git-gui...	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| commitdiff \| raw \| diff to current
2017-10-28	Junio C Hamano	Merge branch 'sg/rev-list-doc-reorder-fix'	blob \| commitdiff \| raw \| diff to current
2017-10-23	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-19	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update'	blob \| commitdiff \| raw \| diff to current
2017-10-18	Junio C Hamano	Merge branch 'ma/pkt-line-leakfix' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-18	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-18	Junio C Hamano	Merge branch 'rs/mailinfo-qp-decode-fix' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-18	Junio C Hamano	Merge branch 'aw/gc-lockfile-fscanf-fix' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-28	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix'	blob \| commitdiff \| raw \| diff to current
2017-09-28	Junio C Hamano	Merge branch 'rs/mailinfo-qp-decode-fix'	blob \| commitdiff \| raw \| diff to current
2017-09-25	Junio C Hamano	Merge branch 'aw/gc-lockfile-fscanf-fix'	blob \| commitdiff \| raw \| diff to current
2017-09-22	Junio C Hamano	Sync with 2.10.5	blob \| commitdiff \| raw \| diff to current
2017-09-22	Junio C Hamano	Merge branch 'jk/safe-pipe-capture' into maint-2.10	blob \| commitdiff \| raw \| diff to current
2017-09-22	Junio C Hamano	Merge branch 'jk/cvsimport-quoting' into maint-2.10	blob \| commitdiff \| raw \| diff to current
2017-09-22	Junio C Hamano	Merge branch 'jc/cvsserver' into maint-2.10	blob \| commitdiff \| raw \| diff to current
2017-09-22	Junio C Hamano	Merge branch 'jk/git-shell-drop-cvsserver' into maint...	blob \| commitdiff \| raw \| diff to current
2017-09-19	Junio C Hamano	Merge branch 'ma/pkt-line-leakfix'	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'jt/doc-pack-objects-fix' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'jn/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'bc/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'rs/t1002-do-not-use-sum' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'rs/find-pack-entry-bisection' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'rj/add-chmod-error-message' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'jc/perl-git-comment-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2017-09-10	Junio C Hamano	Merge branch 'rs/t4062-obsd' into maint	blob \| commitdiff \| raw \| diff to current
2017-08-27	Junio C Hamano	Merge branch 'jt/doc-pack-objects-fix'	blob \| commitdiff \| raw \| diff to current
2017-08-27	Junio C Hamano	Merge branch 'jn/vcs-svn-cleanup'	blob \| commitdiff \| raw \| diff to current
2017-08-27	Junio C Hamano	Merge branch 'bc/vcs-svn-cleanup'	blob \| commitdiff \| raw \| diff to current
2017-08-23	Junio C Hamano	Merge branch 'js/run-process-parallel-api-fix' into...	blob \| commitdiff \| raw \| diff to current
2017-08-23	Junio C Hamano	Merge branch 'rs/t1002-do-not-use-sum'	blob \| commitdiff \| raw \| diff to current
2017-08-22	Junio C Hamano	Merge branch 'rs/t4062-obsd'	blob \| commitdiff \| raw \| diff to current
2017-08-22	Junio C Hamano	Merge branch 'rs/find-pack-entry-bisection'	blob \| commitdiff \| raw \| diff to current
2017-08-22	Junio C Hamano	Merge branch 'rj/add-chmod-error-message'	blob \| commitdiff \| raw \| diff to current
2017-08-22	Junio C Hamano	Merge branch 'jc/perl-git-comment-typofix'	blob \| commitdiff \| raw \| diff to current
2017-08-11	Junio C Hamano	Merge branch 'js/run-process-parallel-api-fix'	blob \| commitdiff \| raw \| diff to current
2017-08-04	Junio C Hamano	Merge branch 'ah/patch-id-doc'	blob \| commitdiff \| raw \| diff to current
2017-07-31	Junio C Hamano	Merge branch 'rs/apply-avoid-over-reading' into maint	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom