diff options
author | typebrook <typebrook@gmail.com> | 2019-04-08 18:08:33 +0800 |
---|---|---|
committer | typebrook <typebrook@gmail.com> | 2019-04-08 18:08:33 +0800 |
commit | af621691177d42e8c939ba33eb464b0b82c33cd3 (patch) | |
tree | b8f9efc689fe184dd531de485e292b6dfb205e3b | |
parent | 8f6d1d1f79177b9a6beb3d19146594aa104ec721 (diff) |
update
-rw-r--r-- | gitconfig | 3 | ||||
-rw-r--r-- | tigrc | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -13,5 +13,8 @@ | |||
13 | [core] | 13 | [core] |
14 | pager = | 14 | pager = |
15 | 15 | ||
16 | [merge] | ||
17 | tool = vimdiff | ||
18 | |||
16 | [color] | 19 | [color] |
17 | ui = off | 20 | ui = off |
@@ -167,6 +167,7 @@ bind status <C-O> ?git am %(file) | |||
167 | #==================== | 167 | #==================== |
168 | bind stash a ?git stash apply %(stash) | 168 | bind stash a ?git stash apply %(stash) |
169 | bind stash d ?>git stash drop %(stash) | 169 | bind stash d ?>git stash drop %(stash) |
170 | bind stash p ?>git stash pop %(stash) | ||
170 | 171 | ||
171 | # rename a stash | 172 | # rename a stash |
172 | bind stash n @sh -c "git stash drop %(stash) | \ | 173 | bind stash n @sh -c "git stash drop %(stash) | \ |
@@ -220,8 +221,8 @@ bind refs > >sh -c "git diff %(branch) --prefix -U1000 | tig" | |||
220 | #==================== | 221 | #==================== |
221 | # log view | 222 | # log view |
222 | #==================== | 223 | #==================== |
223 | bind log n :/^commit | 224 | bind log <C-J> :/^commit |
224 | bind log p :?^commit | 225 | bind log <C-K> :?^commit |
225 | 226 | ||
226 | #==================== | 227 | #==================== |
227 | # diff view | 228 | # diff view |