diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-03-20 14:33:42 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-03-20 14:33:42 +0100 |
| commit | 7d55625ec14eb88f369a5b0e63d0463a5c18e57d (patch) | |
| tree | 17db9b8a0ddefd5c3dd7339c602fa42f81072bac /using-git.texinfo | |
| parent | m (diff) | |
| download | using-git-7d55625ec14eb88f369a5b0e63d0463a5c18e57d.tar.gz using-git-7d55625ec14eb88f369a5b0e63d0463a5c18e57d.tar.bz2 using-git-7d55625ec14eb88f369a5b0e63d0463a5c18e57d.tar.xz | |
explain why you should not squash non-tips
Signed-off-by: Mattias Andrée <maandree@operamail.com>
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. |