|
@@ -769,7 +769,7 @@ commit. The new commit will contain a summary of all the commits which were
|
|
squashed, preceded by a header message indicating that it’s the result of a
|
|
squashed, preceded by a header message indicating that it’s the result of a
|
|
squash (or the message you pass on the command line.).</p></div>
|
|
squash (or the message you pass on the command line.).</p></div>
|
|
<div class="paragraph"><p>Squashing branches is useful when trying to rebase-update over branches which
|
|
<div class="paragraph"><p>Squashing branches is useful when trying to rebase-update over branches which
|
|
-were pushed to their upsteram (or committed by the <em>Commit Queue</em>), and then
|
|
|
|
|
|
+were pushed to their upstream (or committed by the <em>Commit Queue</em>), and then
|
|
conflicting changes landed in upstream on top of the push/commit. If you know
|
|
conflicting changes landed in upstream on top of the push/commit. If you know
|
|
that your branch was committed but <a href="git-rebase-update.html">git-rebase-update(1)</a> isn’t able to
|
|
that your branch was committed but <a href="git-rebase-update.html">git-rebase-update(1)</a> isn’t able to
|
|
automatically clean it, you can squash the troublesome branch before <code>git
|
|
automatically clean it, you can squash the troublesome branch before <code>git
|