test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1464 from evildmp/squashing_commits 

Clarified misleading wording about squashing commits
This commit is contained in:
Julien Phalip 2013-08-10 14:48:46 -07:00
parent 22af1394c6 e868eaf680
commit 6e70f47d02
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/internals/contributing/writing-code/working-with-git.txt
View File

@ -157,7 +157,7 @@ using interactive rebase::
The HEAD~2 above is shorthand for two latest commits. The above command 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". 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 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 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. commit message for the commit now that it includes both your steps.