diff options
| -rw-r--r-- | .config/git/config | 28 | ||||
| -rw-r--r-- | .config/git/gitignore | 5 | ||||
| -rw-r--r-- | .zshrc | 2 |
3 files changed, 31 insertions, 4 deletions
diff --git a/.config/git/config b/.config/git/config index 9fd60e5..240532b 100644 --- a/.config/git/config +++ b/.config/git/config @@ -2,17 +2,39 @@ name = Nicholas Tay email = nick@windblume.net [alias] - c = commit p = push + pu = push -u + puo = push -u origin + pf = push --force-with-lease + pff = push -f + pl = pull + plr = pull --recursive + f = fetch + fo = fetch origin s = status su = status --untracked-files=normal sua = status -u + r = remote rv = remote -v + rb = rebase + rbi = rebase -i a = add aa = add . co = checkout - cam = commit -a -m + cob = checkout -b + cod = checkout development + com = checkout master + c = commit + ca = commit -a cm = commit -m + cam = commit -a -m + camd = commit --amend d = diff - cob = checkout -b + dc = diff --cached l = log + m = merge + rl = reflog + res = restore --staged + ress = restore +[core] + excludesfile = $HOME/.config/git/gitignore diff --git a/.config/git/gitignore b/.config/git/gitignore new file mode 100644 index 0000000..4c8ad0f --- /dev/null +++ b/.config/git/gitignore @@ -0,0 +1,5 @@ +*~ +.DS_Store +*.swp +.\#* +\#*\# @@ -12,7 +12,7 @@ SAVEHIST=1000 # Some misc options setopt auto_cd -setopt share_history +#setopt share_history setopt menu_complete setopt cdable_vars # Automatically push dirs to stack so we can quickly flip between dirs |