aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gitconfig5
-rw-r--r--tigrc2
2 files changed, 6 insertions, 1 deletions
diff --git a/gitconfig b/gitconfig
index 1df5b38..1b728c4 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,6 +3,11 @@
3 name = typebrook 3 name = typebrook
4[alias] 4[alias]
5 reorder = "!GIT_SEQUENCE_EDITOR=\"sed -i -n 'h;1n;2p;g;p'\" git rebase -i HEAD~2" 5 reorder = "!GIT_SEQUENCE_EDITOR=\"sed -i -n 'h;1n;2p;g;p'\" git rebase -i HEAD~2"
6 stashstaged = !git stash --keep-index && \
7 git stash && \
8 git stash apply stash@{1} && \
9 git stash show -p | git apply -R && \
10 git stash drop stash@{1}
6[core] 11[core]
7 pager = 12 pager =
8[color] 13[color]
diff --git a/tigrc b/tigrc
index 3cc12ac..987f01e 100644
--- a/tigrc
+++ b/tigrc
@@ -62,7 +62,7 @@ bind status k :?^[MADRU?]
62 62
63bind status s ?git stash 63bind status s ?git stash
64bind status S @git stash save "%(prompt Enter stash name: )" 64bind status S @git stash save "%(prompt Enter stash name: )"
65bind status gs !git stash save -p "%(prompt Enter stash name: )" 65bind status gs !git stashstaged
66bind status p !git checkout --patch -- %(file) 66bind status p !git checkout --patch -- %(file)
67bind status Tu @git update-index --assume-unchanged %(file) 67bind status Tu @git update-index --assume-unchanged %(file)
68 68