aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-03-20 14:31:31 +0100
committerMattias Andrée <maandree@operamail.com>2014-03-20 14:31:31 +0100
commite1e8737364ed20055dd23dfafd461db02886b69c (patch)
treea61bb06fd432ab9d0c6c946d88113207c5b7c666 /using-git.texinfo
parentwarn agaist squashing non-tips (diff)
downloadusing-git-e1e8737364ed20055dd23dfafd461db02886b69c.tar.gz
using-git-e1e8737364ed20055dd23dfafd461db02886b69c.tar.bz2
using-git-e1e8737364ed20055dd23dfafd461db02886b69c.tar.xz
m
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'using-git.texinfo')
-rw-r--r--using-git.texinfo2
1 files changed, 1 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index d326ef7..c373b4c 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -1457,7 +1457,7 @@ the old commits that have be squashed
and update the new commit. Without
@option{--force} the push will be rejected.
-Try to avoid commit squash between
+Try to avoid commit squashing
were the squash top is not the tip
of a commit chain.