Merge branch 'en/combined-all-paths'
[git/git.git] / merge.c
2019-03-07 Junio C HamanoMerge branch 'en/combined-all-paths'
2019-03-07 Junio C HamanoMerge branch 'sc/pack-redundant'
2019-03-07 Junio C HamanoMerge branch 'du/branch-show-current'
2019-03-07 Junio C HamanoMerge branch 'dl/complete-submodule-absorbgitdirs'
2019-03-07 Junio C HamanoMerge branch 'wh/author-committer-ident-config'
2019-03-07 Junio C HamanoMerge branch 'aw/pretty-trailers'
2019-03-07 Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-03-07 Junio C HamanoMerge branch 'tg/checkout-no-overlay'
2019-02-24 Junio C HamanoMerge branch 'yn/checkout-doc-fix'
2019-02-23 Junio C HamanoMerge branch 'ab/workaround-dash-bug-in-test'
2019-02-14 Junio C HamanoMerge branch 'ea/rebase-compat-doc-fix'
2019-02-14 Junio C HamanoMerge branch 'jc/no-grepping-for-strerror-in-tests'
2019-02-14 Junio C HamanoMerge branch 'jt/fetch-v2-sideband'
2019-02-14 Junio C HamanoMerge branch 'en/rebase-merge-on-sequencer'
2019-02-14 Junio C HamanoMerge branch 'js/mingw-host-cpu'
2019-02-14 Junio C HamanoMerge branch 'sg/stress-test'
2019-02-14 Junio C HamanoMerge branch 'kd/t0028-octal-del-is-377-not-777'
2019-02-14 Junio C HamanoMerge branch 'nd/fileno-may-be-macro'
2019-02-14 Junio C HamanoMerge branch 'rj/sequencer-sign-off-header-static'
2019-02-12 Junio C HamanoMerge branch 'nd/imap-send-typofix'
2019-02-09 Jiang XinMerge branch 'master' of git://github.com/git-l10n...
2019-02-09 Junio C HamanoMerge branch 'js/mingw-host-cpu'
2019-02-09 Junio C HamanoMerge branch 'kl/pretty-doc-markup-fix'
2019-02-09 Junio C HamanoMerge branch 'ld/git-p4-remove-flakey-test'
2019-02-09 Junio C HamanoMerge branch 'js/rebase-i-redo-exec-fix'
2019-02-09 Junio C HamanoMerge branch 'nd/checkout-noisy-unmerge'
2019-02-09 Junio C HamanoMerge branch 'js/smart-http-detect-remote-error'
2019-02-09 Junio C HamanoMerge branch 'ds/coverage-prove'
2019-02-09 Junio C HamanoMerge branch 'tz/gpg-test-fix'
2019-02-09 Junio C HamanoMerge branch 'os/rebase-runs-post-checkout-hook'
2019-02-07 Junio C HamanoMerge branch 'jk/add-ignore-errors-bit-assignment-fix'
2019-02-07 Junio C HamanoMerge branch 'rj/sparse-flags'
2019-02-07 Junio C HamanoMerge branch 'bc/fetch-pack-clear-alternate-shallow'
2019-02-07 Junio C HamanoMerge branch 'ma/doc-diff-usage-fix'
2019-02-07 Junio C HamanoMerge branch 'ab/diff-tree-doc-fix'
2019-02-07 Junio C HamanoMerge branch 'ss/describe-dirty-in-the-right-directory'
2019-02-07 Junio C HamanoMerge branch 'sg/travis-osx-brew-breakage-workaround'
2019-02-07 Junio C HamanoMerge branch 'nd/commit-doc'
2019-02-07 Junio C HamanoMerge branch 'sl/const'
2019-02-07 Junio C HamanoMerge branch 'sh/submodule-summary-abbrev-fix'
2019-02-07 Junio C HamanoMerge branch 'nd/help-align-command-desc'
2019-02-07 Junio C HamanoMerge branch 'jk/loose-object-cache-oid'
2019-02-07 Junio C HamanoMerge branch 'pw/rebase-x-sanity-check'
2019-02-07 Junio C HamanoMerge branch 'js/vsts-ci'
2019-02-07 Junio C HamanoMerge branch 'br/commit-tree-fully-spelled-gpg-sign...
2019-02-07 Junio C HamanoMerge branch 'sb/submodule-abort-update-upon-config...
2019-02-07 Junio C HamanoMerge branch 'sg/travis-specific-cc'
2019-02-07 Junio C HamanoMerge branch 'ds/push-sparse-tree-walk'
2019-02-07 Junio C HamanoMerge branch 'tb/test-lint-sed-options'
2019-02-07 Junio C HamanoMerge branch 'lt/date-human'
2019-02-07 Junio C HamanoMerge branch 'jk/autocrlf-overrides-eol-doc'
2019-02-07 Junio C HamanoMerge branch 'jk/unused-parameter-cleanup'
2019-02-07 Junio C HamanoMerge branch 'nd/the-index-final'
2019-02-05 Junio C HamanoMerge branch 'sg/object-as-type-commit-graph-fix'
2019-02-05 Junio C HamanoMerge branch 'bp/checkout-new-branch-optim'
2019-02-05 Junio C HamanoMerge branch 'jk/attr-macro-fix'
2019-02-05 Junio C HamanoMerge branch 'jk/add-ignore-errors-bit-assignment-fix'
2019-02-05 Junio C HamanoMerge branch 'cc/test-ref-store-typofix'
2019-02-05 Junio C HamanoMerge branch 'sg/obstack-cast-function-type-fix'
2019-01-29 Junio C HamanoMerge branch 'js/add-e-clear-patch-before-stating'
2019-01-29 Junio C HamanoMerge branch 'jk/remote-insteadof-cleanup'
2019-01-29 Junio C HamanoMerge branch 'bc/sha-256'
2019-01-29 Junio C HamanoMerge branch 'jt/fetch-pack-v2'
2019-01-29 Junio C HamanoMerge branch 'jk/proto-v2-hidden-refs-fix'
2019-01-29 Junio C HamanoMerge branch 'jk/save-getenv-result'
2019-01-29 Junio C HamanoMerge branch 'cc/fetch-error-message-fix'
2019-01-29 Junio C HamanoMerge branch 'cc/partial-clone-doc-typofix'
2019-01-18 Junio C HamanoMerge branch 'js/gc-repack-close-before-remove'
2019-01-18 Junio C HamanoMerge branch 'en/show-ref-doc-fix'
2019-01-18 Junio C HamanoMerge branch 'jk/dev-build-format-security'
2019-01-14 Junio C HamanoMerge branch 'tb/use-common-win32-pathfuncs-on-cygwin'
2019-01-14 Junio C HamanoMerge branch 'km/rebase-doc-typofix'
2019-01-14 Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix-cleanup'
2019-01-14 Junio C HamanoMerge branch 'hn/highlight-sideband-keywords'
2019-01-14 Junio C HamanoMerge branch 'cb/t5004-empty-tar-archive-fix'
2019-01-14 Junio C HamanoMerge branch 'cb/openbsd-allows-reading-directory'
2019-01-14 Junio C HamanoMerge branch 'hb/t0061-dot-in-path-fix'
2019-01-14 Junio C HamanoMerge branch 'ab/commit-graph-progress-fix'
2019-01-14 Nguyễn Thái Ngọc Duyread-cache.c: kill read_index()
2019-01-14 Nguyễn Thái Ngọc Duyrepository.c: replace hold_locked_index() with repo_hol...
2019-01-04 Junio C HamanoMerge branch 'mk/http-backend-kill-children-before...
2019-01-04 Junio C HamanoMerge branch 'sg/clone-initial-fetch-configuration'
2019-01-04 Junio C HamanoMerge branch 'en/merge-path-collision'
2019-01-03 Junio C HamanoMerge branch 'sg/test-bash-version-fix'
2018-12-15 Junio C HamanoMerge branch 'jc/run-command-report-exec-failure-fix...
2018-12-15 Junio C HamanoMerge branch 'js/help-commands-verbose-by-default-fix...
2018-12-15 Junio C HamanoMerge branch 'nd/show-gitcomp-compilation-fix' into...
2018-12-15 Junio C HamanoMerge branch 'js/mailinfo-format-flowed-fix' into maint
2018-12-15 Junio C HamanoMerge branch 'ds/hash-independent-tests-fix' into maint
2018-12-13 Jiang XinMerge branch 'master' of github.com:linusboyle/git
2018-12-04 Junio C HamanoMerge branch 'en/rebase-consistency'
2018-12-01 Junio C HamanoMerge branch 'ss/msvc-strcasecmp'
2018-12-01 Junio C HamanoMerge branch 'rt/rebase-in-c-message-fix'
2018-12-01 Junio C HamanoMerge branch 'sg/daemon-test-signal-fix'
2018-12-01 Junio C HamanoMerge branch 'ma/reset-doc-rendering-fix'
2018-12-01 Junio C HamanoMerge branch 'ab/replace-graft-with-replace-advice'
2018-11-29 Junio C HamanoMerge branch 'nd/n18n-fix'
2018-11-26 Junio C HamanoMerge branch 'nd/per-worktree-ref-iteration'
2018-11-26 Junio C HamanoMerge branch 'tb/clone-case-smashing-warning-test'
2018-11-26 Junio C HamanoMerge branch 'jk/t5562-perl-path-fix'
next