diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-12-04 06:49:39 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-12-04 06:49:39 +0300 |
commit | 5335669531d83d7d6c905bcfca9b5f8e182dc4d4 (patch) | |
tree | 372cba4738c6c91c2060969f4be8247cbb8307f6 /Documentation/git-rebase.txt | |
parent | 7e75a63d7400b780cbc794d205c0880c893ff7de (diff) | |
parent | 6fcbad87d476d7281832af843dd448c94673fbfc (diff) |
Merge branch 'en/rebase-consistency'
* en/rebase-consistency:
rebase docs: fix incorrect format of the section Behavioral Differences
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r-- | Documentation/git-rebase.txt | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 80793bad8d..dff17b3178 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -550,24 +550,28 @@ Other incompatible flag pairs: BEHAVIORAL DIFFERENCES ----------------------- - * empty commits: +There are some subtle differences how the backends behave. - am-based rebase will drop any "empty" commits, whether the - commit started empty (had no changes relative to its parent to - start with) or ended empty (all changes were already applied - upstream in other commits). +Empty commits +~~~~~~~~~~~~~ + +The am backend drops any "empty" commits, regardless of whether the +commit started empty (had no changes relative to its parent to +start with) or ended empty (all changes were already applied +upstream in other commits). - merge-based rebase does the same. +The merge backend does the same. - interactive-based rebase will by default drop commits that - started empty and halt if it hits a commit that ended up empty. - The `--keep-empty` option exists for interactive rebases to allow - it to keep commits that started empty. +The interactive backend drops commits by default that +started empty and halts if it hits a commit that ended up empty. +The `--keep-empty` option exists for the interactive backend to allow +it to keep commits that started empty. - * directory rename detection: +Directory rename detection +~~~~~~~~~~~~~~~~~~~~~~~~~~ - merge-based and interactive-based rebases work fine with - directory rename detection. am-based rebases sometimes do not. +The merge and interactive backends work fine with +directory rename detection. The am backend sometimes does not. include::merge-strategies.txt[] |