diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-03-20 14:29:59 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-03-20 14:29:59 +0100 |
| commit | 1ca258ac8c14b8e9a08153bb1078dd50271022ba (patch) | |
| tree | b074238fcc71babd350facd808a1b436f1bffb8c | |
| parent | typo + commit squashing (diff) | |
| download | using-git-1ca258ac8c14b8e9a08153bb1078dd50271022ba.tar.gz using-git-1ca258ac8c14b8e9a08153bb1078dd50271022ba.tar.bz2 using-git-1ca258ac8c14b8e9a08153bb1078dd50271022ba.tar.xz | |
warn agaist squashing non-tips
Signed-off-by: Mattias Andrée <maandree@operamail.com>
| -rw-r--r-- | using-git.texinfo | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/using-git.texinfo b/using-git.texinfo index 079269f..d326ef7 100644 --- a/using-git.texinfo +++ b/using-git.texinfo @@ -1457,6 +1457,10 @@ 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 +were the squash top is not the tip +of a commit chain. + @node Think about the children |