diff options
| author | Julien Phalip <jphalip@gmail.com> | 2013-08-10 14:48:46 -0700 |
|---|---|---|
| committer | Julien Phalip <jphalip@gmail.com> | 2013-08-10 14:48:46 -0700 |
| commit | 6e70f47d02a9c5d32c0d3e88cdd6f0f93458e7ca (patch) | |
| tree | cdb8308b0580d7585a68cf909f252278d4c44466 /docs | |
| parent | 22af1394c64b6687e45747ae9f643068b340a867 (diff) | |
| parent | e868eaf680a3d7acfcd3c76743bb248d29ac7b60 (diff) | |
Merge pull request #1464 from evildmp/squashing_commits
Clarified misleading wording about squashing commits
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/contributing/writing-code/working-with-git.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/internals/contributing/writing-code/working-with-git.txt b/docs/internals/contributing/writing-code/working-with-git.txt index dcfdd9e85b..32fc459e70 100644 --- a/docs/internals/contributing/writing-code/working-with-git.txt +++ b/docs/internals/contributing/writing-code/working-with-git.txt @@ -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. |