diff options
| -rw-r--r-- | .config/git/config | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/.config/git/config b/.config/git/config index 240532b..f9c5043 100644 --- a/.config/git/config +++ b/.config/git/config @@ -4,26 +4,40 @@ [alias] p = push pu = push -u - puo = push -u origin + puo = "!git push -u origin \"$(git branch --show-current)\"" pf = push --force-with-lease pff = push -f - pl = pull - plr = pull --recursive + pl = pull --recurse-submodules + plo = pull f = fetch fo = fetch origin s = status su = status --untracked-files=normal sua = status -u + st = stash + stm = stash -m + stp = stash pop + stpp = "!git stash pop \"$(git stash list | fzf | cut -d ':' -f 1)\"" + stl = stash list + stD = stash drop + sts = "!git stash show -p stash@{$1} #" + stss = "!git stash show -p \"$(git stash list | fzf | cut -d ':' -f 1)\"" r = remote rv = remote -v rb = rebase rbi = rebase -i + rbd = rebase development + rbm = rebase master a = add aa = add . + ap = add -p co = checkout + coo = "!git checkout \"$(git for-each-ref --format='%(refname:short)' refs/heads/ | fzf)\"" cob = checkout -b cod = checkout development com = checkout master + cot = checkout --track + cott = "!git checkout --track \"$(git for-each-ref --format='%(refname:short)' refs/remotes/ | fzf)\"" c = commit ca = commit -a cm = commit -m @@ -33,8 +47,17 @@ dc = diff --cached l = log m = merge + md = merge development + mm = merge master rl = reflog res = restore --staged ress = restore + b = branch + br = branch --remote + bD = branch -D + bDD = "!git branch -D \"$(git for-each-ref --format='%(refname:short)' refs/heads/ | fzf)\"" + chp = cherry-pick + cl = clone --recurse-submodules + cll = clone [core] excludesfile = $HOME/.config/git/gitignore |