Kaydet (Commit) 6e70f47d authored tarafından Julien Phalip's avatar Julien Phalip

Merge pull request #1464 from evildmp/squashing_commits

Clarified misleading wording about squashing commits
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment