Git cheat sheet - Revision history

Simson: /* Submodules! */

2020-06-24T19:43:06Z

Submodules!

← Older revision		Revision as of 12:43, 24 June 2020
Line 48:		Line 48:

	==Submodules!==		==Submodules!==
	Submodules are complicated. Here is some recommended readings:		Submodules are complicated. . It's important to remember that a parent module pegs to a particular submodule commit point, not to a branch. The parent module does not automatically get the updates when the submodule is updated. This allows the authors of the submodule to do work without worry about breaking parents until the parents actually update their submodules. In this way, they work like versioned libraries.

			Here are some recommended readings:

	Documentation:		Documentation:

Simson: /* Compare with a remote fork and take changes */

2020-06-24T19:41:15Z

Compare with a remote fork and take changes

← Older revision		Revision as of 12:41, 24 June 2020
Line 47:		Line 47:
	git merge uckelman/master		git merge uckelman/master

			==Submodules!==
			Submodules are complicated. Here is some recommended readings:

			Documentation:
			* https://git-scm.com/book/en/v2/Git-Tools-Submodules
			* https://www.atlassian.com/git/tutorials/git-submodule

			Short article:
			* https://github.blog/2016-02-01-working-with-submodules/

			Longer Tutorial:
			* https://medium.com/@porteneuve/mastering-git-submodules-34c65e940407

	==References==		==References==

Simson at 22:57, 17 August 2013

2013-08-17T22:57:25Z

← Older revision		Revision as of 15:57, 17 August 2013
Line 52:		Line 52:
	* http://git.661346.n2.nabble.com/quot-secret-key-not-available-quot-quot-unable-to-sign-the-tag-quot-td1500685.html		* http://git.661346.n2.nabble.com/quot-secret-key-not-available-quot-quot-unable-to-sign-the-tag-quot-td1500685.html
	* https://help.github.com/articles/fork-a-repo		* https://help.github.com/articles/fork-a-repo

			[[Category::Cheat Sheets]]

Simson: /* Origin info */

2013-05-29T00:08:35Z

Origin info

← Older revision		Revision as of 17:08, 28 May 2013
Line 6:		Line 6:
	git config remote.origin.url git@github.com...		git config remote.origin.url git@github.com...

			Change origins for current and all submodules:
			git config -e

	==Make a signed tag and push to github==		==Make a signed tag and push to github==

Simson at 16:33, 12 May 2013

2013-05-12T16:33:21Z

← Older revision		Revision as of 09:33, 12 May 2013
Line 1:		Line 1:
			==Origin info==
			Initial checkout:
			git clone <url> --recursive

			change origin (useful if you cloned from a github http: but want to save it with a git@github.com...)
			git config remote.origin.url git@github.com...



	==Make a signed tag and push to github==		==Make a signed tag and push to github==
	git tag -u 'Simson L. Garfinkel <simsong@acm.org>' -s tcpflow-1.2.7 -m 'Release 1.2.7'		git tag -u 'Simson L. Garfinkel <simsong@acm.org>' -s tcpflow-1.2.7 -m 'Release 1.2.7'

Simson at 14:43, 24 April 2013

2013-04-24T14:43:00Z

@@ Line 27: / Line 27: @@
     git diff origin/master # Difference between you and the master
     git log origin/master  # Report what the differences are
 ==References==

Simson at 16:56, 10 April 2013

2013-04-10T16:56:10Z

← Older revision		Revision as of 09:56, 10 April 2013
Line 5:		Line 5:

	==Pull changes==		==Pull changes==
	~~; from~~ a forked repository's upstream:		From a forked repository's upstream. First we need to add 'upstream' as a name for a remote URL:
	git remote add upstream https://github.com/<<FOOBAR>>		git remote add upstream https://github.com/<<FOOBAR>>

			Now we need to fetch the changes and merge them in:
	git fetch upstream # fetches any new changes from original repository		git fetch upstream # fetches any new changes from original repository
	git merge upstream/master # merges any changes fetched into your working files		git merge upstream/master # merges any changes fetched into your working files
	or
	~~git pull upstream~~

	git pull ~~automatically merges~~ changes~~. With fetch and merge,~~ the ~~changes are fetched and stored locally, then merged when~~ you ~~request~~.		This can be done as a single operation:
			git pull upstream/master

			If there are local changes:
			* Resolve the conflicts
			* Note which conflicts you have resolved with <tt>git add conflictname</tt>.
			* commit your changes
			* push them to your origin/master:
			git push


	==Differencing==		==Differencing==

Simson at 14:52, 10 April 2013

2013-04-10T14:52:09Z

← Older revision		Revision as of 07:52, 10 April 2013
Line 6:		Line 6:
	==Pull changes==		==Pull changes==
	; from a forked repository's upstream:		; from a forked repository's upstream:
			git remote add upstream https://github.com/<<FOOBAR>>
	git fetch upstream # fetches any new changes from original repository		git fetch upstream # fetches any new changes from original repository
	git merge upstream/master # merges any changes fetched into your working files		git merge upstream/master # merges any changes fetched into your working files
Line 12:		Line 13:

	git pull automatically merges changes. With fetch and merge, the changes are fetched and stored locally, then merged when you request.		git pull automatically merges changes. With fetch and merge, the changes are fetched and stored locally, then merged when you request.

			==Differencing==
			git diff HEAD # should never produce output because HEAD is always the checked out commit
			git diff origin/master # Difference between you and the master
			git log origin/master # Report what the differences are

	==References==		==References==

Simson at 14:41, 10 April 2013

2013-04-10T14:41:22Z

← Older revision		Revision as of 07:41, 10 April 2013
Line 3:		Line 3:
	git push --tags		git push --tags


			==Pull changes==
			; from a forked repository's upstream:
			git fetch upstream # fetches any new changes from original repository
			git merge upstream/master # merges any changes fetched into your working files
			or
			git pull upstream

			git pull automatically merges changes. With fetch and merge, the changes are fetched and stored locally, then merged when you request.

	==References==		==References==
	* http://learn.github.com/p/tagging.html		* http://learn.github.com/p/tagging.html
	* http://git.661346.n2.nabble.com/quot-secret-key-not-available-quot-quot-unable-to-sign-the-tag-quot-td1500685.html		* http://git.661346.n2.nabble.com/quot-secret-key-not-available-quot-quot-unable-to-sign-the-tag-quot-td1500685.html
			* https://help.github.com/articles/fork-a-repo

Simson: Created page with "==Make a signed tag and push to github== git tag -u 'Simson L. Garfinkel ' -s tcpflow-1.2.7 -m 'Release 1.2.7' git push --tags ==References== * http://l..."

2012-05-26T23:30:26Z

Created page with "==Make a signed tag and push to github== git tag -u 'Simson L. Garfinkel <simsong@acm.org>' -s tcpflow-1.2.7 -m 'Release 1.2.7' git push --tags ==References== * http://l..."

New page

==Make a signed tag and push to github==
git tag -u 'Simson L. Garfinkel <simsong@acm.org>' -s tcpflow-1.2.7 -m 'Release 1.2.7'
git push --tags

==References==
* http://learn.github.com/p/tagging.html
* http://git.661346.n2.nabble.com/quot-secret-key-not-available-quot-quot-unable-to-sign-the-tag-quot-td1500685.html