Git/squash - Revision history

Woozle at 15:20, 12 November 2018

2018-11-12T15:20:05Z

← Older revision		Revision as of 15:20, 12 November 2018
Line 1:		Line 1:
	==Notes==		==Notes==
	Squashing seems to involve something like this:		Squashing seems to involve something like this (not yet tested):
	# Create new branch from master		# Create new branch from master and switch to it
	$ ~~[[..~~/~~checkout~~\|~~git~~ checkout]] -b squash-~~feature~~		$ git {{l/same\|checkout}} -b {{arg\|squash-branch}}

	# 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 {{arg\|~~feature~~}}		$ git {{l/same\|read-tree}} -m -u {{arg\|source-branch}}

	~~...where <code>~~squash-~~feature</code>~~ is ~~just a conventional name for~~ the branch in which you are doing the squashing~~, and~~ {{arg\|~~feature~~}} is the name of the branch you're squashing [from].		# commit and push to origin
			$ git commit
			$ git {{l/same\|push}} origin {{arg\|squash-branch}} --set-upstream

			Where:
			* {{arg\|squash-branch}} is the temporary branch into which you are doing the squashing
			* {{arg\|source-branch}} is the name of the branch you're squashing [from].

Woozle at 12:28, 31 October 2018

2018-10-31T12:28:31Z

← Older revision		Revision as of 12:28, 31 October 2018
Line 5:		Line 5:

	# 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 {{arg\|feature}}

	...where "squash-feature" is just a conventional name for the branch in which you are doing the squashing.		...where <code>squash-feature</code> is just a conventional name for the branch in which you are doing the squashing, and {{arg\|feature}} is the name of the branch you're squashing [from].

Woozle at 12:27, 31 October 2018

2018-10-31T12:27:19Z

← Older revision		Revision as of 12:27, 31 October 2018
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.

Woozle: 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..."

2018-10-31T12:25:14Z

Created page with "==Notes== Squashing seems to involve something like this: # Create new branch from master $ [[../checkout|git checkout]] -b squash-feature # squash the commits from featu..."

New page

==Notes==
Squashing seems to involve something like this:
# Create new branch from master
$ [[../checkout|git checkout]] -b squash-feature

# squash the commits from feature into your squash branch
$ [[../read-tree|git read-tree]] -m -u feature