aboutsummaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--git/Makefile12
-rw-r--r--git/bash-aliases50
2 files changed, 62 insertions, 0 deletions
diff --git a/git/Makefile b/git/Makefile
new file mode 100644
index 0000000..a428302
--- /dev/null
+++ b/git/Makefile
@@ -0,0 +1,12 @@
+.POSIX:
+
+install:
+ mkdir -p -- ~/.config/bash/aliases.d
+ test ! -d ~/.config/bash/aliases.d/git
+ ln -sf -- ~/.dotfiles/git/bash-aliases ~/.config/bash/aliases.d/git
+
+uninstall:
+ -unlink -- ~/.config/bash/aliases.d/git
+ -rmdir -- ~/.config/bash/aliases.d
+
+.PHONY: install uninstall
diff --git a/git/bash-aliases b/git/bash-aliases
new file mode 100644
index 0000000..3552668
--- /dev/null
+++ b/git/bash-aliases
@@ -0,0 +1,50 @@
+# -*- shell-script -*-
+
+alias gitlog="git log --graph --decorate"
+alias gitlogg="git log --graph --decorate --full-history"
+
+gitcomm () {
+ git commit --signoff -S"$GPG_KEY" -m "$*"
+}
+
+ge () {
+ if [ -z "$EDITOR" ]; then
+ printf '\e[1;31m%s\e[0m\n' 'No default editor is set, please configure the environment variable EDITOR'
+ else
+ $EDITOR -- "$@"
+ git add -- "$@"
+ fi
+}
+
+gitpush () {
+ git push -u origin `___git_branch_`
+}
+
+gitpull () {
+ __gb_=`___git_branch_`
+ git checkout "$1" &&
+ git pull &&
+ git checkout $__gb_ &&
+ git pull . "$1"
+ unset __gb_
+}
+
+gitp () {
+ __gb_=`___git_branch_`
+ git pull &&
+ git checkout "$1" &&
+ git pull &&
+ git pull . $__gb_
+ unset __gb_
+}
+
+
+_____gp___bashrc_ () {
+ printf '%s\n' "$2"
+}
+_____gp__bashrc_ () {
+ _____gp___bashrc_ `git status -b -s 2>/dev/null`
+}
+___git_branch_ () {
+ printf '%s\n' `_____gp__bashrc_ | cut -d . -f 1`
+}