From 3440cd624c1393882945866832c3561c5aacdff2 Mon Sep 17 00:00:00 2001 From: TheK4n Date: Sun, 9 Jan 2022 03:01:53 +0300 Subject: [PATCH] edit(gitconfig): edit aliases ca ci: rm -m param, add aliases: stage, last --- .gitconfig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index cfc052f..e3329b4 100644 --- a/.gitconfig +++ b/.gitconfig @@ -20,8 +20,8 @@ a = "!git status --short | peco | awk '{print $2}' | xargs git add" d = diff co = checkout - ci = commit -m - ca = commit -am + ci = commit + ca = commit -a ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)" pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)" st = status @@ -36,6 +36,10 @@ type = cat-file -t dump = cat-file -p find = "!f() { git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative -S'pretty' -S\"$@\" | peco | awk '{print $1}' | xargs -I {} git diff {}^ {}; }; f" + unstage = 'reset HEAD --' + last = 'log -1 HEAD' + + # edit conflicted file on merge edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"