Merge branch 'mr/show-config-scope'

Junio C Hamano committed over 6 years ago

Merge branch 'rs/strbuf-insertstr'

Junio C Hamano committed over 6 years ago

Merge branch 'rs/parse-options-concat-dup'

Junio C Hamano committed over 6 years ago

Merge branch 'bc/hash-independent-tests-part-8'

Junio C Hamano committed over 6 years ago

Merge branch 'rs/name-rev-memsave'

Junio C Hamano committed over 6 years ago

git-gui: add missing close bracket

Pratyush Yadav committed over 6 years ago

Merge branch 'cs/german-translation'

Pratyush Yadav committed over 6 years ago

git-gui: update German translation

Christian Stimming committed over 6 years ago

git-gui: extend translation glossary template with more terms

Christian Stimming committed over 6 years ago

git-gui: update pot template and German translation to current source code

Christian Stimming committed over 6 years ago

Sync with 2.25.1

Junio C Hamano committed over 6 years ago

Git 2.25.1

Junio C Hamano committed over 6 years ago

rebase: rename the two primary rebase backends

Elijah Newren committed over 6 years ago

rebase: change the default backend from "am" to "merge"

Elijah Newren committed over 6 years ago

rebase: make the backend configurable via config setting

Elijah Newren committed over 6 years ago

rebase tests: repeat some tests using the merge backend instead of am

Elijah Newren committed over 6 years ago

rebase tests: mark tests specific to the am-backend with --am

Elijah Newren committed over 6 years ago

rebase: drop '-i' from the reflog for interactive-based rebases

Elijah Newren committed over 6 years ago

git-prompt: change the prompt for interactive-based rebases

Elijah Newren committed over 6 years ago

rebase: add an --am option

Elijah Newren committed over 6 years ago