Git: Difference between revisions

Get your GPG configured, and a personal key installed.  Configure Git to use your personal key.

$ git config --global user.signingkey 0A46826A

</source>

You can sign commits simply by adding -S once your environment is configured.

$ git commit -S -m 'push a signed commit'

You can check and verify via <span class="package">git log</span>:

$ git log --show-signature -1

You can configure <span class="package">git log</span> to check any signatures and list them in output via <span class="package">%G?</span> format.

$ git log --pretty="format:%h %G? %aN  %s"

You can also reject commits that are unsigned and invalid:

$ git merge --verify-signature non-verify

$ git merge --verify-signatures signed-branch

Sign the merge commit itself:

$ git merge --verify-signatures -S signed-branch

= Commands =

== Get a build number ==

A commit count can be used as a build number for a revision (e.g. HEAD, master, a commit hash):

$ git rev-list --count <revision>

To get the commit count across all branches:

$ git rev-list --all --count

== Add a local branch that tracks a remote branch ==

$ git branch --track greet origin/greet

$ git branch -a

$ git merge origin/master

== Pulling changes from a remote ==

== Rebase a branch ==

$ git checkout cbranch

Switched to branch 'cbranch'

$

== Merge a branch ==

$ git checkout autonotif

Switched to branch 'autonotif'

  1 file changed, 1 insertion(+)

  create mode 100644 foobarrecords_savenew.hns

Merges <branchname> onto autonotif branch

== Remove a tag ==

$ git tag -d <tagname>

== Undo last commit ==

This undo is recorded as a part of the git log.

$ git revert HEAD

== Fix or amend last commit ==

== Reset the branch to a specific point in the past ==

$ git reset --hard <hash>

--hard parameter also updates the working directory. Reset shouldn't be used in a group project on a remote repository because of its potential for confusion.

;Temporary ignore changes to a file

$ git update-index --assume-unchanged <filename>

;Back to tracking changes to the file

$ git update-index --no-assume-unchanged <filename>

;Get a list of folders and files that are <code>assume-unchanged</code>

$ git ls-files -v | grep '^h'

== Ignore file modes ==

Verify the connectivity and validity of the objects

$ git fsck --unreachable

Manage reflog information

$ git reflog expire --expire=0 --all

Pack unpacked objects in a repository

$ git repack -a -d -l

Prune all unreachable objects from the object database

$ git prune

Clean up unnecessary files and optimize the local repository

$ git gc --aggressive

= Useful git aliases =

This is a snapshot of my ~/.gitconfig

[user]

         name = Michael Han

[merge]

         defaultToUpstream = true

= Links =