diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 13:00:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 13:00:31 -0800 |
| commit | 2b15318a963a036b7d9b73e538c5ca566fec9794 (patch) | |
| tree | aee21ed0152eb1aefc8e8e2420de58a251d45b4b /git-rebase.txt | |
| parent | 59a32b07d3e226cad19135aee37bf81c8849efc8 (diff) | |
| download | git-htmldocs-2b15318a963a036b7d9b73e538c5ca566fec9794.tar.gz | |
Autogenerated HTML docs for v2.34.1-297-g69a9c1
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index a1af21fce..9da464706 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -714,9 +714,9 @@ information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is -set to diff3, the apply backend will use "constructed merge base" to -label the content from the merge base, and thus provide no information -about the merge base commit whatsoever. +set to diff3 or zdiff3, the apply backend will use "constructed merge +base" to label the content from the merge base, and thus provide no +information about the merge base commit whatsoever. The merge backend works with the full commits on both sides of history and thus has no such limitations. |