Git - Revision history

PhilippeTeuwen: /* gpg */

2017-01-02T15:21:16Z

gpg

← Older revision		Revision as of 15:21, 2 January 2017
Line 541:		Line 541:
	To sign lately projects where I can verify locally the old commits are still mine, I do:		To sign lately projects where I can verify locally the old commits are still mine, I do:
	git commit --amend -S --allow-empty -m "By signing this commit, I guarantee older commits authored by myself are indeed mine." -m "" -m "Please verify this signature"		git commit --amend -S --allow-empty -m "By signing this commit, I guarantee older commits authored by myself are indeed mine." -m "" -m "Please verify this signature"
			More: https://mikegerwitz.com/papers/git-horror-story.html

2017-01-02T13:13:59Z

gpg

← Older revision		Revision as of 13:13, 2 January 2017
Line 538:		Line 538:

	To let github verifying your signatures, import your key: https://github.com/settings/keys -> New GPG key <- gpg --export -a 9B554C36544C89BC and, if needed, verify any unverified email you plan to use (https://github.com/settings/emails).		To let github verifying your signatures, import your key: https://github.com/settings/keys -> New GPG key <- gpg --export -a 9B554C36544C89BC and, if needed, verify any unverified email you plan to use (https://github.com/settings/emails).

			To sign lately projects where I can verify locally the old commits are still mine, I do:
			git commit --amend -S --allow-empty -m "By signing this commit, I guarantee older commits authored by myself are indeed mine." -m "" -m "Please verify this signature"

2017-01-02T13:09:08Z

gpg

← Older revision		Revision as of 13:09, 2 January 2017
Line 529:		Line 529:
	* https://help.github.com/articles/generating-a-gpg-key/		* https://help.github.com/articles/generating-a-gpg-key/

			Assuming you already configured your name ane email, GPG key to use can be declared globally
	[commit]
			git config --global user.signingkey 9B554C36544C89BC
⚫	gpgsign = true
			or locally
	[user]
			git config user.signingkey 9B554C36544C89BC
	name = John Doe
			You can sign commits and tags with flag "-S"
	email = john@doe.org
			or just say you want to sign all commits in a given project:
	signingkey = 1234ABCD
		⚫	git config commit.gpgsign true

			To let github verifying your signatures, import your key: https://github.com/settings/keys -> New GPG key <- gpg --export -a 9B554C36544C89BC and, if needed, verify any unverified email you plan to use (https://github.com/settings/emails).

2016-11-30T19:36:02Z

proxy

← Older revision		Revision as of 19:36, 30 November 2016
Line 526:		Line 526:
	And register it in your config, that's it		And register it in your config, that's it
	git config --global core.gitproxy gitproxy		git config --global core.gitproxy gitproxy
			==gpg==
			* https://help.github.com/articles/generating-a-gpg-key/

			[commit]
			gpgsign = true
			[user]
			name = John Doe
			email = john@doe.org
			signingkey = 1234ABCD

2016-05-10T12:46:24Z

Misc

@@ Line 490: / Line 490: @@
 * Committing a submitted ordinary patch (contrary to git format-patch):
  GIT_AUTHOR_NAME="John Doe" GIT_AUTHOR_EMAIL=john@doe.com git commit ...
 ==etckeeper==

2013-10-09T18:57:48Z

Misc

← Older revision		Revision as of 18:57, 9 October 2013
Line 488:		Line 488:
	* Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description.		* Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description.
	* Git on VFAT fs: mount it with option shortname=mixed otherwise git doesn't recognize the repository		* Git on VFAT fs: mount it with option shortname=mixed otherwise git doesn't recognize the repository
			* Committing a submitted ordinary patch (contrary to git format-patch):
			GIT_AUTHOR_NAME="John Doe" GIT_AUTHOR_EMAIL=john@doe.com git commit ...

	==etckeeper==		==etckeeper==

2013-09-06T09:22:43Z

Converting a SVN repository into a Git one

← Older revision		Revision as of 09:22, 6 September 2013
Line 479:		Line 479:
	git gc --prune=now		git gc --prune=now

	Note that some of the steps might be easier by using https://github.com/nirvdrum/svn2git thanks Frank Morgner for the tips.		Note that some of the steps might be easier by using https://github.com/nirvdrum/svn2git (thanks Frank Morgner for the tips) or http://subgit.com/ .

	==Misc==		==Misc==

2013-07-19T09:16:08Z

Private server with git-shell

← Older revision		Revision as of 09:16, 19 July 2013
Line 410:		Line 410:
	$ git commit -m "initial commit"		$ git commit -m "initial commit"
	$ git remote add origin git@your-server:/var/cache/git/myproject.git		$ git remote add origin git@your-server:/var/cache/git/myproject.git
			$ git branch --set-upstream master origin/master
	$ git push origin master		$ git push origin master
	Other developers can then do		Other developers can then do

2013-07-19T09:02:02Z

Server

@@ Line 394: / Line 394: @@
  git clone git://git.yobi.be/git/foobar.git
  git clone http://git.yobi.be/git/foobar.git
 ===Converting a SVN repository into a Git one===
 A good source of inspiration is http://thomasrast.ch/git/git-svn-conversion.html

2013-02-22T16:31:57Z

Tracking yet another remote branch & merging changes

← Older revision		Revision as of 16:31, 22 February 2013
Line 273:		Line 273:
	Or in one step:		Or in one step:
	git checkout -b bar repo_nickname/bar		git checkout -b bar repo_nickname/bar
	Then ~~possibly~~:		Then if possible:
	git rebase master		git rebase master
			Then
	Otherwise
	git checkout master		git checkout master
	git merge bar		git merge bar
	But in that case there is no real need for bar:
	git merge repo_nickname/bar

	==Server==		==Server==