Difference between revisions of "Git/squash"
< Git
Jump to navigation
Jump to search
(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...") |
|||
| 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.