From 72b6f46e4b545231ce6adf6b51cf0ab563618f55 Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 25 Mar 2019 22:18:11 +0800 Subject: update --- gitconfig | 5 +++++ tigrc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gitconfig b/gitconfig index 1df5b38..1b728c4 100644 --- a/gitconfig +++ b/gitconfig @@ -3,6 +3,11 @@ name = typebrook [alias] reorder = "!GIT_SEQUENCE_EDITOR=\"sed -i -n 'h;1n;2p;g;p'\" git rebase -i HEAD~2" + stashstaged = !git stash --keep-index && \ + git stash && \ + git stash apply stash@{1} && \ + git stash show -p | git apply -R && \ + git stash drop stash@{1} [core] pager = [color] diff --git a/tigrc b/tigrc index 3cc12ac..987f01e 100644 --- a/tigrc +++ b/tigrc @@ -62,7 +62,7 @@ bind status k :?^[MADRU?] bind status s ?git stash bind status S @git stash save "%(prompt Enter stash name: )" -bind status gs !git stash save -p "%(prompt Enter stash name: )" +bind status gs !git stashstaged bind status p !git checkout --patch -- %(file) bind status Tu @git update-index --assume-unchanged %(file) -- cgit v1.2.3-70-g09d2