Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1464 from evildmp/squashing_commits

Clarified misleading wording about squashing commits
  • Loading branch information...
commit 6e70f47d02a9c5d32c0d3e88cdd6f0f93458e7ca 2 parents 22af139 + e868eaf
Julien Phalip jphalip authored
2  docs/internals/contributing/writing-code/working-with-git.txt
View
@@ -157,7 +157,7 @@ using interactive rebase::
The HEAD~2 above is shorthand for two latest commits. The above command
will open an editor showing the two commits, prefixed with the word "pick".
-Change the second line to "squash" instead. This will keep the
+Change "pick" on the second line to "squash" instead. This will keep the
first commit, and squash the second commit into the first one. Save and quit
the editor. A second editor window should open, so you can reword the
commit message for the commit now that it includes both your steps.
Please sign in to comment.
Something went wrong with that request. Please try again.