summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-02-17Merge branch 'jk/doc-credential-helper'Junio C Hamano
2020-02-17Merge branch 'js/mingw-open-in-gdb'Junio C Hamano
2020-02-17Merge branch 'js/test-unc-fetch'Junio C Hamano
2020-02-17Merge branch 'js/test-avoid-pipe'Junio C Hamano
2020-02-17Merge branch 'js/test-write-junit-xml-fix'Junio C Hamano
2020-02-17Merge branch 'jk/mailinfo-cleanup'Junio C Hamano
2020-02-17Merge branch 'mr/show-config-scope'Junio C Hamano
2020-02-17Merge branch 'rs/strbuf-insertstr'Junio C Hamano
2020-02-17Merge branch 'rs/parse-options-concat-dup'Junio C Hamano
2020-02-17Merge branch 'bc/hash-independent-tests-part-8'Junio C Hamano
2020-02-17Merge branch 'rs/name-rev-memsave'Junio C Hamano
2020-02-17Sync with 2.25.1Junio C Hamano
2020-02-17Git 2.25.1v2.25.1Junio C Hamano
2020-02-16rebase: rename the two primary rebase backendsElijah Newren
2020-02-16rebase: change the default backend from "am" to "merge"Elijah Newren
2020-02-16rebase: make the backend configurable via config settingElijah Newren
2020-02-16rebase tests: repeat some tests using the merge backend instead of amElijah Newren
2020-02-16rebase tests: mark tests specific to the am-backend with --amElijah Newren
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren
2020-02-16git-prompt: change the prompt for interactive-based rebasesElijah Newren
2020-02-16rebase: add an --am optionElijah Newren
2020-02-16rebase: move incompatibility checks between backend options a bit earlierElijah Newren
2020-02-16git-rebase.txt: add more details about behavioral differences of backendsElijah Newren
2020-02-16rebase: allow more types of rebases to fast-forwardElijah Newren
2020-02-16t3432: make these tests work with either am or merge backendsElijah Newren
2020-02-16rebase: fix handling of restrict_revisionElijah Newren
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerElijah Newren
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingElijah Newren
2020-02-16t3406: simplify an already simple testElijah Newren
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyElijah Newren
2020-02-16rebase (interactive-backend): make --keep-empty the defaultElijah Newren
2020-02-16prefix_path: show gitdir when arg is outside repoEmily Shaffer
2020-02-14doc: move credential helper info into gitcredentials(7)Jeff King
2020-02-14Sync with maintJunio C Hamano
2020-02-14The fifth batch for 2.26Junio C Hamano
2020-02-14Merge branch 'tb/commit-graph-object-dir'Junio C Hamano
2020-02-14Merge branch 'jk/index-pack-dupfix'Junio C Hamano
2020-02-14Merge branch 'jk/alloc-cleanups'Junio C Hamano
2020-02-14Merge branch 'jh/notes-fanout-fix'Junio C Hamano
2020-02-14Merge branch 'pk/status-of-uncloned-submodule'Junio C Hamano
2020-02-14Merge branch 'mt/use-passed-repo-more-in-funcs'Junio C Hamano
2020-02-14Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'Junio C Hamano
2020-02-14Merge branch 'ds/sparse-checkout-harden'Junio C Hamano
2020-02-14Merge branch 'ld/p4-cleanup-processes'Junio C Hamano
2020-02-14Merge branch 'jt/connectivity-check-optim-in-partial-clone'Junio C Hamano
2020-02-14Merge branch 'jk/get-oid-error-message-i18n'Junio C Hamano
2020-02-14Merge branch 'ag/edit-todo-drop-check'Junio C Hamano
2020-02-14Merge branch 'dl/test-must-fail-fixes-2'Junio C Hamano
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Junio C Hamano
2020-02-14Merge branch 'js/rebase-i-with-colliding-hash'Junio C Hamano