Skip to content

Commit

Permalink
clarified misleading wording about squashing commits
Browse files Browse the repository at this point in the history
  • Loading branch information
evildmp committed Aug 10, 2013
1 parent 7a2296e commit e868eaf
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit e868eaf

Please sign in to comment.