Skip to content

Commit

Permalink
More git + gpg
Browse files Browse the repository at this point in the history
  • Loading branch information
awdeorio committed Jun 11, 2017
1 parent 64b9be3 commit a7b8f20
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .always_forget.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1715,6 +1715,15 @@ git checkout --theirs PATH/FILE # conflict: keep their file
git checkout --ours PATH/FILE # conflict: keep my file
git commit # conflict: I'm done, finish merge

# Signing with GPG keys
gpg -K --keyid-format LONG # list keys
git config --global user.signingkey KEY # set key
export GPG_TTY=$(tty) # connect to GPG
git tag -s TAG # create a signed tag
git tag -v TAG # verify signed tag
git commit -S # create a signed commit
git verify-commit HEAD # verify signed commit

# Rebase automatically, resulting in a linear history like Subversion
# Ref: http://stevenharman.net/git-pull-with-automatic-rebase
git config branch.autosetuprebase always
Expand Down
1 change: 1 addition & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[user]
name = Andrew DeOrio
signingkey = BB6201BA07530070
[color]
diff = auto
status = auto
Expand Down

0 comments on commit a7b8f20

Please sign in to comment.