aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.aliases4
-rw-r--r--.gitconfig31
-rwxr-xr-x.zplugrc1
3 files changed, 35 insertions, 1 deletions
diff --git a/.aliases b/.aliases
index 872eba4..c28f4c6 100644
--- a/.aliases
+++ b/.aliases
@@ -50,3 +50,7 @@ fi
if command -v tig &> /dev/null; then
alias tigs='tig status'
fi
+
+# git alias
+
+alias g='git'
diff --git a/.gitconfig b/.gitconfig
index 24fc57c..02f0814 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -13,3 +13,34 @@
[core]
excludesFile = ~/.gitignore
attributesfile = ~/.gitattributes
+[alias]
+ ap = add --patch
+ ci = commit
+ br = branch
+ co = checkout
+ st = status
+ stsb = status --short --branch
+ df = diff
+ dfc = diff --cached
+ dt = difftool
+ mt = mergetool
+
+ rmc = rm --cached
+ untrack = rm --cached
+
+ lo = log --oneline --graph --decorate
+ loa = log --oneline --graph --decorate --all
+
+ lol = log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'
+ lols = log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat
+ lola = log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all
+
+ cp = cherry-pick
+ cpa = cherry-pick --abort
+ cpc = cherry-pick --continue
+
+ rb = rebase
+ rbi = rebase -i
+ rbc = rebase --continue
+ rba = rebase --abort
+ rbs = rebase --skip
diff --git a/.zplugrc b/.zplugrc
index ca5358a..ce58d09 100755
--- a/.zplugrc
+++ b/.zplugrc
@@ -8,7 +8,6 @@ if [ ! -d $ZPLUG_HOME ]; then
fi
source $ZPLUG_HOME/init.zsh
-zplug "plugins/git", from:oh-my-zsh
zplug "zsh-users/zsh-completions"
zplug "zsh-users/zsh-syntax-highlighting"
zplug "dracula/zsh", as:theme