projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
merge-strategies: avoid implying that "-s theirs" exists
[git] / gitweb /
2017-07-30  Junio C HamanoMerge tag 'v2.8.6' into maint-2.9 tree | commitdiff
2017-07-30  Junio C HamanoMerge tag 'v2.7.6' into maint-2.8 tree | commitdiff
2017-05-05  Junio C HamanoMerge branch 'maint-2.8' into maint-2.9 tree | commitdiff
2017-05-05  Junio C HamanoMerge branch 'maint-2.7' into maint-2.8 tree | commitdiff
2017-05-05  Junio C HamanoMerge branch 'maint-2.6' into maint-2.7 tree | commitdiff
2016-12-05  Junio C HamanoMerge branch 'jk/common-main' into maint-2.10 tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused' into... tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'nd/worktree-lock' into maint tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'ps/common-info-doc' into maint tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'nd/test-helpers' into maint tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix' into... tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'rs/commit-pptr-simplify' into maint tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix' into... tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'ak/pre-receive-hook-template-modefix... tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'jk/daemon-path-ok-check-truncation' into... tree | commitdiff
2016-11-29  Junio C HamanoMerge branch 'mm/send-email-cc-cruft-after-address... tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'pb/test-parse-options-expect' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'rs/pretty-format-color-doc-fix' into... tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'js/reset-usage' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'po/fix-doc-merge-base-illustration' into... tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'jk/tap-verbose-fix' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'tg/add-chmod+x-fix' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'bw/submodule-branch-dot-doc' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'jk/tighten-alloc' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'jk/merge-base-fork-point-without-reflog... tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'sb/submodule-config-doc-drop-path' into... tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'nd/commit-p-doc' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'jk/clone-copy-alternates-fix' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'dp/autoconf-curl-ssl' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'ak/curl-imap-send-explicit-scheme' into... tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'js/regexec-buf' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'rs/c-auto-resets-attributes' into maint tree | commitdiff
2016-10-28  Junio C HamanoMerge branch 'yk/git-tag-remove-mention-of-old-layout... tree | commitdiff
2016-10-16  Jiang XinMerge branch 'russian-l10n' of https://github.com/DJm00... tree | commitdiff
2016-10-11  Junio C HamanoMerge branch 'jk/verify-packfile-gently' into maint tree | commitdiff
2016-10-11  Junio C HamanoMerge branch 'jc/verify-loose-object-header' into maint tree | commitdiff
2016-10-11  Junio C HamanoMerge branch 'rs/git-gui-use-modern-git-merge-syntax... tree | commitdiff
2016-10-11  Junio C HamanoMerge branch 'pb/rev-list-reverse-with-count' into... tree | commitdiff
2016-10-11  Junio C HamanoMerge branch 'jk/graph-padding-fix' into maint tree | commitdiff
2016-10-11  Junio C HamanoMerge branch 'rs/copy-array' into maint tree | commitdiff
2016-10-03  Junio C HamanoMerge branch 'jk/ident-ai-canonname-could-be-null'... tree | commitdiff
2016-10-03  Junio C HamanoMerge branch 'jk/doc-cvs-update' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'tg/add-chmod+x-fix' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'et/add-chmod-x' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'ls/travis-homebrew-path-fix' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'js/regexec-buf' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'ep/doc-check-ref-format-example' into... tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'mm/config-color-ui-default-to-auto' into... tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'jk/reduce-gc-aggressive-depth' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'jk/rebase-i-drop-ident-check' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'ew/http-do-not-forget-to-call-curl-multi... tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'jk/fix-remote-curl-url-wo-proto' into... tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'mr/vcs-svn-printf-ulong' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'rs/strbuf-remove-fix' into maint tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'rs/checkout-some-states-are-const' into... tree | commitdiff
2016-09-29  Junio C HamanoMerge branch 'bw/pathspec-remove-unused-extern-decl... tree | commitdiff
2016-09-26  Junio C HamanoMerge branch 'rs/use-modern-git-merge-syntax' of git... tree | commitdiff
2016-09-19  Junio C HamanoMerge branch 'po/range-doc' into maint tree | commitdiff
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'hv/doc-commit-reference-style' into maint tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'sg/reflog-past-root' into maint tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'rs/mailinfo-lib' into maint tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'jk/tighten-alloc' into maint tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'rs/use-strbuf-add-unique-abbrev' into... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'rs/merge-recursive-string-list-init'... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'rs/merge-add-strategies-simplification... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix' into... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'dg/document-git-c-in-git-config-doc'... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'js/no-html-bypass-on-windows' into maint tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'js/mv-dir-to-new-directory' into maint tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'js/import-tars-hardlinks' into maint tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'ms/document-pack-window-memory-is-per... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'jk/push-force-with-lease-creation' into... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'jk/reflog-date' into maint tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf... tree | commitdiff
2016-09-09  Junio C HamanoMerge branch 'jk/common-main' into maint tree | commitdiff
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui tree | commitdiff
2016-08-31  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix' tree | commitdiff
2016-08-31  Junio C HamanoMerge branch 'mh/blame-worktree' tree | commitdiff
2016-08-31  Junio C HamanoMerge branch 'kw/patch-ids-optim' tree | commitdiff
2016-08-25  Junio C HamanoMerge branch 'dg/document-git-c-in-git-config-doc' tree | commitdiff
2016-08-25  Junio C HamanoMerge branch 'js/no-html-bypass-on-windows' tree | commitdiff
2016-08-25  Junio C HamanoMerge branch 'hv/doc-commit-reference-style' tree | commitdiff
2016-08-19  Junio C HamanoMerge branch 'ab/hooks' tree | commitdiff
2016-08-19  Junio C HamanoMerge branch 'tb/t0027-raciness-fix' tree | commitdiff
2016-08-17  Junio C HamanoMerge branch 'sg/reflog-past-root' tree | commitdiff
2016-08-17  Junio C HamanoMerge branch 'rs/mailinfo-lib' tree | commitdiff
2016-08-17  Junio C HamanoMerge branch 'jk/tighten-alloc' tree | commitdiff
2016-08-16  Junio C HamanoMerge branch 'lt/gpg-show-long-key-in-signature-verific... tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'kw/patch-ids-optim' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'ew/http-backend-batch-headers' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'va/i18n' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'js/mv-dir-to-new-directory' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'rs/use-strbuf-add-unique-abbrev' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'jk/big-and-future-archive-tar' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'jk/trace-fixup' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'rs/merge-recursive-string-list-init' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'rs/merge-add-strategies-simplification' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'rs/child-process-init' tree | commitdiff
2016-08-12  Junio C HamanoMerge branch 'js/import-tars-hardlinks' tree | commitdiff
next
Unnamed repository; edit this file 'description' to name the repository.