summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-02-16rebase tests: mark tests specific to the am-backend with --amLibravatar Elijah Newren11-53/+53
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesLibravatar Elijah Newren3-10/+10
2020-02-16git-prompt: change the prompt for interactive-based rebasesLibravatar Elijah Newren2-9/+5
2020-02-16rebase: add an --am optionLibravatar Elijah Newren2-2/+27
2020-02-16rebase: move incompatibility checks between backend options a bit earlierLibravatar Elijah Newren1-11/+11
2020-02-16git-rebase.txt: add more details about behavioral differences of backendsLibravatar Elijah Newren1-5/+80
2020-02-16rebase: allow more types of rebases to fast-forwardLibravatar Elijah Newren2-4/+16
2020-02-16t3432: make these tests work with either am or merge backendsLibravatar Elijah Newren1-26/+22
2020-02-16rebase: fix handling of restrict_revisionLibravatar Elijah Newren2-3/+21
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerLibravatar Elijah Newren2-2/+9
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingLibravatar Elijah Newren2-8/+4
2020-02-16t3406: simplify an already simple testLibravatar Elijah Newren1-5/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyLibravatar Elijah Newren6-23/+183
2020-02-16rebase (interactive-backend): make --keep-empty the defaultLibravatar Elijah Newren9-55/+126
2020-02-16prefix_path: show gitdir when arg is outside repoLibravatar Emily Shaffer2-2/+4
2020-02-14doc: move credential helper info into gitcredentials(7)Libravatar Jeff King2-91/+88
2020-02-14Sync with maintLibravatar Junio C Hamano0-0/+0
2020-02-14The fifth batch for 2.26Libravatar Junio C Hamano1-0/+71
2020-02-14Merge branch 'tb/commit-graph-object-dir'Libravatar Junio C Hamano9-87/+101
2020-02-14Merge branch 'jk/index-pack-dupfix'Libravatar Junio C Hamano2-5/+7
2020-02-14Merge branch 'jk/alloc-cleanups'Libravatar Junio C Hamano5-8/+16
2020-02-14Merge branch 'jh/notes-fanout-fix'Libravatar Junio C Hamano2-33/+94
2020-02-14Merge branch 'pk/status-of-uncloned-submodule'Libravatar Junio C Hamano2-1/+34
2020-02-14Merge branch 'mt/use-passed-repo-more-in-funcs'Libravatar Junio C Hamano22-76/+106
2020-02-14Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'Libravatar Junio C Hamano2-8/+21
2020-02-14Merge branch 'ds/sparse-checkout-harden'Libravatar Junio C Hamano6-156/+346
2020-02-14Merge branch 'ld/p4-cleanup-processes'Libravatar Junio C Hamano1-71/+110
2020-02-14Merge branch 'jt/connectivity-check-optim-in-partial-clone'Libravatar Junio C Hamano4-13/+33
2020-02-14Merge branch 'jk/get-oid-error-message-i18n'Libravatar Junio C Hamano3-51/+63
2020-02-14Merge branch 'ag/edit-todo-drop-check'Libravatar Junio C Hamano5-49/+214
2020-02-14Merge branch 'dl/test-must-fail-fixes-2'Libravatar Junio C Hamano8-95/+204
2020-02-14Merge branch 'ag/rebase-avoid-unneeded-checkout'Libravatar Junio C Hamano3-30/+5
2020-02-14Merge branch 'js/rebase-i-with-colliding-hash'Libravatar Junio C Hamano3-9/+34
2020-02-14Merge branch 'kw/fsmonitor-watchman-racefix'Libravatar Junio C Hamano11-87/+434
2020-02-14Merge branch 'mt/threaded-grep-in-object-store'Libravatar Junio C Hamano14-98/+233
2020-02-14Merge branch 'jn/promote-proto2-to-default'Libravatar Junio C Hamano14-45/+54
2020-02-14Merge branch 'jk/packfile-reuse-cleanup'Libravatar Junio C Hamano9-122/+362
2020-02-14Merge branch 'hw/advice-add-nothing'Libravatar Junio C Hamano6-4/+26
2020-02-14Merge branch 'js/convert-typofix' into maintLibravatar Junio C Hamano1-1/+1
2020-02-14Merge branch 'js/ci-squelch-doc-warning' into maintLibravatar Junio C Hamano1-0/+1
2020-02-14Merge branch 'jb/multi-pack-index-docfix' into maintLibravatar Junio C Hamano1-2/+3
2020-02-14Merge branch 'ma/diff-doc-clarify-regexp-example' into maintLibravatar Junio C Hamano1-4/+4
2020-02-14Merge branch 'ms/doc-bundle-format' into maintLibravatar Junio C Hamano1-0/+48
2020-02-14Merge branch 'es/submodule-fetch-message-fix' into maintLibravatar Junio C Hamano1-1/+1
2020-02-14Merge branch 'jb/parse-options-message-fix' into maintLibravatar Junio C Hamano2-4/+4
2020-02-14Merge branch 'ma/filter-branch-doc-caret' into maintLibravatar Junio C Hamano1-3/+3
2020-02-14Merge branch 'km/submodule-doc-use-sm-path' into maintLibravatar Junio C Hamano1-1/+1
2020-02-14Merge branch 'pb/do-not-recurse-grep-no-index' into maintLibravatar Junio C Hamano3-4/+17
2020-02-14Merge branch 'jt/t5616-robustify' into maintLibravatar Junio C Hamano1-13/+23
2020-02-14Merge branch 'en/fill-directory-fixes-more' into maintLibravatar Junio C Hamano2-45/+47