From 7d55625ec14eb88f369a5b0e63d0463a5c18e57d Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Thu, 20 Mar 2014 14:33:42 +0100
Subject: explain why you should not squash non-tips
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 using-git.texinfo | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'using-git.texinfo')

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.
 
 
 
-- 
cgit v1.2.3-70-g09d2