Git/squash: Difference between revisions
from HTYP, the free directory anyone can edit if they can prove to me that they're not a spambot
< Git
Created page with "==Notes== Squashing seems to involve something like this: # Create new branch from master $ git checkout -b squash-feature # squash the commits from featu..." |
No edit summary |
||
| Line 6: | Line 6: | ||
# squash the commits from feature into your squash branch | # squash the commits from feature into your squash branch | ||
$ [[../read-tree|git read-tree]] -m -u feature | $ [[../read-tree|git read-tree]] -m -u feature | ||
...where "squash-feature" is just a conventional name for the branch in which you are doing the squashing. | |||
Revision as of 12:27, 31 October 2018
Notes
Squashing seems to involve something like this:
# Create new branch from master $ git checkout -b squash-feature # squash the commits from feature into your squash branch $ git read-tree -m -u feature
...where "squash-feature" is just a conventional name for the branch in which you are doing the squashing.
