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