Andrew's git / gitweb.git / history
?
Git 2.21-rc2
[gitweb.git] / builtin / merge-ours.c
2019-02-14 Merge branch 'ea/rebase-compat-doc-fix' blob | diff | raw
2019-02-14 Merge branch 'jc/no-grepping-for-strerror-in-tests' blob | diff | raw
2019-02-14 Merge branch 'jt/fetch-v2-sideband' blob | diff | raw
2019-02-14 Merge branch 'en/rebase-merge-on-sequencer' blob | diff | raw
2019-02-14 Merge branch 'js/mingw-host-cpu' blob | diff | raw
2019-02-14 Merge branch 'sg/stress-test' blob | diff | raw
2019-02-14 Merge branch 'kd/t0028-octal-del-is-377-not-777' blob | diff | raw
2019-02-14 Merge branch 'nd/fileno-may-be-macro' blob | diff | raw
2019-02-14 Merge branch 'rj/sequencer-sign-off-header-static' blob | diff | raw
2019-02-12 Merge branch 'nd/imap-send-typofix' blob | diff | raw
2019-02-09 Merge branch 'js/mingw-host-cpu' blob | diff | raw
2019-02-09 Merge branch 'kl/pretty-doc-markup-fix' blob | diff | raw
2019-02-09 Merge branch 'ld/git-p4-remove-flakey-test' blob | diff | raw
2019-02-09 Merge branch 'js/rebase-i-redo-exec-fix' blob | diff | raw
2019-02-09 Merge branch 'nd/checkout-noisy-unmerge' blob | diff | raw
2019-02-09 Merge branch 'js/smart-http-detect-remote-error' blob | diff | raw
2019-02-09 Merge branch 'ds/coverage-prove' blob | diff | raw
2019-02-09 Merge branch 'tz/gpg-test-fix' blob | diff | raw
2019-02-09 Merge branch 'os/rebase-runs-post-checkout-hook' blob | diff | raw
2019-02-07 Merge branch 'jk/add-ignore-errors-bit-assignment-fix' blob | diff | raw
2019-02-07 Merge branch 'rj/sparse-flags' blob | diff | raw
2019-02-07 Merge branch 'bc/fetch-pack-clear-alternate-shallow' blob | diff | raw
2019-02-07 Merge branch 'ma/doc-diff-usage-fix' blob | diff | raw
2019-02-07 Merge branch 'ab/diff-tree-doc-fix' blob | diff | raw
2019-02-07 Merge branch 'ss/describe-dirty-in-the-right-directory' blob | diff | raw
2019-02-07 Merge branch 'sg/travis-osx-brew-breakage-workaround' blob | diff | raw
2019-02-07 Merge branch 'nd/commit-doc' blob | diff | raw
2019-02-07 Merge branch 'sl/const' blob | diff | raw
2019-02-07 Merge branch 'sh/submodule-summary-abbrev-fix' blob | diff | raw
2019-02-07 Merge branch 'nd/help-align-command-desc' blob | diff | raw
2019-02-07 Merge branch 'jk/loose-object-cache-oid' blob | diff | raw
2019-02-07 Merge branch 'pw/rebase-x-sanity-check' blob | diff | raw
2019-02-07 Merge branch 'js/vsts-ci' blob | diff | raw
2019-02-07 Merge branch 'br/commit-tree-fully-spelled-gpg-sign... blob | diff | raw
2019-02-07 Merge branch 'sb/submodule-abort-update-upon-config... blob | diff | raw
2019-02-07 Merge branch 'sg/travis-specific-cc' blob | diff | raw
2019-02-07 Merge branch 'ds/push-sparse-tree-walk' blob | diff | raw
2019-02-07 Merge branch 'tb/test-lint-sed-options' blob | diff | raw
2019-02-07 Merge branch 'lt/date-human' blob | diff | raw
2019-02-07 Merge branch 'jk/autocrlf-overrides-eol-doc' blob | diff | raw
2019-02-07 Merge branch 'jk/unused-parameter-cleanup' blob | diff | raw
2019-02-07 Merge branch 'nd/the-index-final' blob | diff | raw
2019-02-07 Merge branch 'js/rebase-am' blob | diff | raw | diff to current
2019-02-07 Merge branch 'tt/bisect-in-c' blob | diff | raw | diff to current
2019-02-07 Merge branch 'tb/utf-16-le-with-explicit-bom' blob | diff | raw | diff to current
2019-02-07 Merge branch 'km/init-doc-typofix' blob | diff | raw | diff to current
2019-02-07 Merge branch 'en/rebase-merge-on-sequencer' blob | diff | raw | diff to current
2019-02-05 Merge branch 'sg/object-as-type-commit-graph-fix' blob | diff | raw | diff to current
2019-02-05 Merge branch 'nd/fetch-compact-update' blob | diff | raw | diff to current
2019-02-05 Merge branch 'sg/strbuf-addbuf-cocci' blob | diff | raw | diff to current
2019-02-05 Merge branch 'pw/no-editor-in-rebase-i-implicit' blob | diff | raw | diff to current
2019-02-05 Merge branch 'jk/diff-cc-stat-fixes' blob | diff | raw | diff to current
2019-02-05 Merge branch 'bp/checkout-new-branch-optim' blob | diff | raw | diff to current
2019-02-05 Merge branch 'ja/doc-style-fix' blob | diff | raw | diff to current
2019-02-05 Merge branch 'ph/pack-objects-mutex-fix' blob | diff | raw | diff to current
2019-02-05 Merge branch 'jk/attr-macro-fix' blob | diff | raw | diff to current
2019-02-05 Merge branch 'js/test-git-installed' blob | diff | raw | diff to current
2019-02-05 Merge branch 'jk/add-ignore-errors-bit-assignment-fix' blob | diff | raw | diff to current
2019-02-05 Merge branch 'cc/test-ref-store-typofix' blob | diff | raw | diff to current
2019-02-05 Merge branch 'sg/obstack-cast-function-type-fix' blob | diff | raw | diff to current
2019-02-05 Merge branch 'ld/git-p4-shelve-update-fix' blob | diff | raw | diff to current
2019-02-05 Merge branch 'jt/get-reference-with-commit-graph' blob | diff | raw | diff to current
2019-02-05 Merge branch 'sb/more-repo-in-api' blob | diff | raw | diff to current
2019-01-29 Merge branch 'js/add-e-clear-patch-before-stating' blob | diff | raw | diff to current
2019-01-29 Merge branch 'jk/remote-insteadof-cleanup' blob | diff | raw | diff to current
2019-01-29 Merge branch 'ms/http-no-more-failonerror' blob | diff | raw | diff to current
2019-01-29 Merge branch 'os/rebase-runs-post-checkout-hook' blob | diff | raw | diff to current
2019-01-29 Merge branch 'bc/sha-256' blob | diff | raw | diff to current
2019-01-29 Merge branch 'sb/submodule-recursive-fetch-gets-the... blob | diff | raw | diff to current
2019-01-29 Merge branch 'jt/fetch-pack-v2' blob | diff | raw | diff to current
2019-01-29 Merge branch 'jk/proto-v2-hidden-refs-fix' blob | diff | raw | diff to current
2019-01-29 Merge branch 'jk/save-getenv-result' blob | diff | raw | diff to current
2019-01-29 Merge branch 'pw/diff-color-moved-ws-fix' blob | diff | raw | diff to current
2019-01-29 Merge branch 'js/rebase-i-redo-exec' blob | diff | raw | diff to current
2019-01-29 Merge branch 'cc/fetch-error-message-fix' blob | diff | raw | diff to current
2019-01-29 Merge branch 'cc/partial-clone-doc-typofix' blob | diff | raw | diff to current
2019-01-29 Merge branch 'kg/external-diff-save-env' blob | diff | raw | diff to current
2019-01-24 cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch blob | diff | raw
2019-01-18 Merge branch 'js/gc-repack-close-before-remove' blob | diff | raw | diff to current
2019-01-18 Merge branch 'en/show-ref-doc-fix' blob | diff | raw | diff to current
2019-01-18 Merge branch 'ot/ref-filter-object-info' blob | diff | raw | diff to current
2019-01-18 Merge branch 'sg/stress-test' blob | diff | raw | diff to current
2019-01-18 Merge branch 'rs/sha1-file-close-mapped-file-on-error' blob | diff | raw | diff to current
2019-01-18 Merge branch 'po/git-p4-wo-login' blob | diff | raw | diff to current
2019-01-18 Merge branch 'tg/t5570-drop-racy-test' blob | diff | raw | diff to current
2019-01-18 Merge branch 'jk/dev-build-format-security' blob | diff | raw | diff to current
2019-01-18 Merge branch 'so/cherry-pick-always-allow-m1' blob | diff | raw | diff to current
2019-01-18 Merge branch 'nd/worktree-remove-with-uninitialized... blob | diff | raw | diff to current
2019-01-18 Merge branch 'sg/test-bash-version-fix' blob | diff | raw | diff to current
2019-01-18 Merge branch 'rb/hpe' blob | diff | raw | diff to current
2019-01-18 Merge branch 'ed/simplify-setup-git-dir' blob | diff | raw | diff to current
2019-01-18 Merge branch 'cy/zsh-completion-SP-in-path' blob | diff | raw | diff to current
2019-01-18 Merge branch 'cy/completion-typofix' blob | diff | raw | diff to current
2019-01-18 Merge branch 'ew/ban-strncat' blob | diff | raw | diff to current
2019-01-18 Merge branch 'ds/commit-graph-assert-missing-parents' blob | diff | raw | diff to current
2019-01-18 Merge branch 'es/doc-worktree-guessremote-config' blob | diff | raw | diff to current
2019-01-18 Merge branch 'sb/submodule-unset-core-worktree-when... blob | diff | raw | diff to current
2019-01-18 Merge branch 'ma/asciidoctor' blob | diff | raw | diff to current
2019-01-18 Merge branch 'jn/stripspace-wo-repository' blob | diff | raw | diff to current
2019-01-18 Merge branch 'sb/submodule-fetchjobs-default-to-one' blob | diff | raw | diff to current
next