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

rebase: move incompatibility checks between backend options a bit earlier

Elijah Newren committed over 6 years ago

git-rebase.txt: add more details about behavioral differences of backends

Elijah Newren committed over 6 years ago

rebase: allow more types of rebases to fast-forward

Elijah Newren committed over 6 years ago

t3432: make these tests work with either am or merge backends

Elijah Newren committed over 6 years ago

rebase: fix handling of restrict_revision

Elijah Newren committed over 6 years ago

rebase: make sure to pass along the quiet flag to the sequencer

Elijah Newren committed over 6 years ago