diff options
Diffstat (limited to 'using-git.texinfo')
| -rw-r--r-- | using-git.texinfo | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index c373b4c..600b09c 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1459,7 +1459,10 @@ and update the new commit. Without Try to avoid commit squashing were the squash top is not the tip -of a commit chain. +of a commit chain. It will probably +lead to merge conflicts and you will +have interate the process for +subsequent commits. |