summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-02-19bisect--helper: return error codes from `cmd_bisect__helper()`Pranit Bauva1-1/+1
2020-02-19bisect: add enum to represent bisect returning codesMiriam Rubio2-2/+14
2020-02-19bisect--helper: introduce new `decide_next()` functionTanushree Tumane1-32/+34
2020-02-19bisect: use the standard 'if (!var)' way to check for 0Miriam Rubio1-2/+2
2020-02-19bisect--helper: change `retval` to `res`Tanushree Tumane1-26/+26
2020-02-19bisect--helper: convert `vocab_*` char pointers to char arraysMiriam Rubio1-2/+2
2020-02-18check-ignore: fix documentation and implementation to matchElijah Newren3-19/+35
2020-02-18doc-diff: use single-colon rule in rendering MakefileJeff King1-1/+1
2020-02-18doc/config/push: use longer "--" line for preformatted exampleJeff King1-2/+2
2020-02-18rev-list --count: comment on the use of count_right++Junio C Hamano1-0/+7
2020-02-18Merge branch 'py/missing-bracket'Pratyush Yadav1-1/+1
2020-02-17The sixth batch for 2.26Junio C Hamano1-29/+15
2020-02-17Merge branch 'es/outside-repo-errmsg-hints'Junio C Hamano2-2/+4
2020-02-17Merge branch 'jk/doc-credential-helper'Junio C Hamano2-91/+88
2020-02-17Merge branch 'js/mingw-open-in-gdb'Junio C Hamano2-0/+23
2020-02-17Merge branch 'js/test-unc-fetch'Junio C Hamano1-0/+12
2020-02-17Merge branch 'js/test-avoid-pipe'Junio C Hamano2-6/+10
2020-02-17Merge branch 'js/test-write-junit-xml-fix'Junio C Hamano1-1/+2
2020-02-17Merge branch 'jk/mailinfo-cleanup'Junio C Hamano2-25/+52
2020-02-17Merge branch 'mr/show-config-scope'Junio C Hamano10-139/+248
2020-02-17Merge branch 'rs/strbuf-insertstr'Junio C Hamano11-15/+26
2020-02-17Merge branch 'rs/parse-options-concat-dup'Junio C Hamano2-26/+18
2020-02-17Merge branch 'bc/hash-independent-tests-part-8'Junio C Hamano46-279/+1817
2020-02-17Merge branch 'rs/name-rev-memsave'Junio C Hamano1-62/+125
2020-02-17git-gui: add missing close bracketPratyush Yadav1-1/+1
2020-02-17Merge branch 'cs/german-translation'Pratyush Yadav5-2753/+3807
2020-02-17git-gui: update German translationChristian Stimming2-385/+602
2020-02-17git-gui: extend translation glossary template with more termsChristian Stimming2-46/+305
2020-02-17git-gui: update pot template and German translation to current source codeChristian Stimming2-2533/+3111
2020-02-16Sync with 2.25.1Junio C Hamano1-0/+55
2020-02-16Git 2.25.1v2.25.1Junio C Hamano3-2/+57
2020-02-16rebase: rename the two primary rebase backendsElijah Newren18-168/+166
2020-02-16rebase: change the default backend from "am" to "merge"Elijah Newren4-8/+22
2020-02-16rebase: make the backend configurable via config settingElijah Newren2-7/+32
2020-02-16rebase tests: repeat some tests using the merge backend instead of amElijah Newren2-4/+26
2020-02-16rebase tests: mark tests specific to the am-backend with --amElijah Newren11-53/+53
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesElijah Newren3-10/+10
2020-02-16git-prompt: change the prompt for interactive-based rebasesElijah Newren2-9/+5
2020-02-16rebase: add an --am optionElijah Newren2-2/+27
2020-02-16rebase: move incompatibility checks between backend options a bit earlierElijah Newren1-11/+11
2020-02-16git-rebase.txt: add more details about behavioral differences of backendsElijah Newren1-5/+80
2020-02-16rebase: allow more types of rebases to fast-forwardElijah Newren2-4/+16
2020-02-16t3432: make these tests work with either am or merge backendsElijah Newren1-26/+22
2020-02-16rebase: fix handling of restrict_revisionElijah Newren2-3/+21
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerElijah Newren2-2/+9
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingElijah Newren2-8/+4
2020-02-16t3406: simplify an already simple testElijah Newren1-5/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyElijah Newren6-23/+183
2020-02-16rebase (interactive-backend): make --keep-empty the defaultElijah Newren9-55/+126
2020-02-16prefix_path: show gitdir when arg is outside repoEmily Shaffer2-2/+4