update .gitconfig & update .bashrc

hongliang5316 · Jun 27, 2017 · c6fbcbd · c6fbcbd
1 parent 3be80c6
commit c6fbcbd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.bashrc b/.bashrc
@@ -23,3 +23,4 @@ export VISUAL='vim'
 
 PATH=$PATH:$HOME/bin
 
+export GPG_TTY=$(tty)
diff --git a/.bashrc.bak b/.bashrc.bak
@@ -52,6 +52,4 @@ export PATH=/opt/stapxx:$PATH
 export PATH=/opt/lemplate:$PATH
 export PATH=/opt/openresty-devel-utils:$PATH
 export LC_ALL=en_US.UTF-8
-
-# added by travis gem
-[ -f /root/.travis/travis.sh ] && source /root/.travis/travis.sh
+export GPG_TTY=$(tty)
diff --git a/.gitconfig b/.gitconfig
@@ -1,9 +1,10 @@
 [user]
     name = hongliang
-    email = [email protected]
+    email = [email protected]
+	signingkey = 0DBFF7F9FD3ADB62
 [alias]
     st = status
-    ci = commit -v
+    ci = commit -avS
     ck = checkout
     co = clone
     df = diff --color
@@ -14,5 +15,11 @@
     lg = log --stat --color
     sh = show --color
     sa = stash
+    phm = push origin master
+    plm = pull origin master
+    rebase = rebase --exec 'git commit --amend --no-edit -n -S'
+    cis = commit --amend --no-edit -n -S
 [diff]
     algorithm = patience
+[commit]
+	gpgsign = true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,3 +23,4 @@ export VISUAL='vim'

		PATH=$PATH:$HOME/bin

		export GPG_TTY=$(tty)