diff options
Diffstat (limited to 'tigrc')
-rw-r--r-- | tigrc | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -103,7 +103,7 @@ bind main bbD ?>git branch -D %(branch) | |||
103 | bind main brd ?git branch -rd %(remote)/%(branch) | 103 | bind main brd ?git branch -rd %(remote)/%(branch) |
104 | bind main bv +sh -c "git branch -vv | grep %(branch)" | 104 | bind main bv +sh -c "git branch -vv | grep %(branch)" |
105 | bind main bm @git branch -m %(branch) "%(prompt New branch name: )" | 105 | bind main bm @git branch -m %(branch) "%(prompt New branch name: )" |
106 | bind main bM @git branch -f "%(prompt Move which branch to here? )" %(commit) | 106 | bind main bM @git branch --force "%(prompt Move which branch to here? )" %(commit) |
107 | bind main c @sh -c "git branch --points-at=%(commit) | \ | 107 | bind main c @sh -c "git branch --points-at=%(commit) | \ |
108 | sed -n '/^*/ {n;p}' | \ | 108 | sed -n '/^*/ {n;p}' | \ |
109 | (cat -; echo %(commit)) | \ | 109 | (cat -; echo %(commit)) | \ |
@@ -129,7 +129,7 @@ bind main pp ?git push | |||
129 | bind main pP ?git push -u %(remote) %(branch):%(branch) | 129 | bind main pP ?git push -u %(remote) %(branch):%(branch) |
130 | bind main pr ?git push -u '%(prompt Which remote? )' %(branch):%(branch) | 130 | bind main pr ?git push -u '%(prompt Which remote? )' %(branch):%(branch) |
131 | bind main pR ?git push -u '%(prompt Which remote? )' %(branch):'%(prompt Which branch? )' | 131 | bind main pR ?git push -u '%(prompt Which remote? )' %(branch):'%(prompt Which branch? )' |
132 | bind main pF ?git push -f | 132 | bind main pF ?git push --force |
133 | bind main pd ?git push %(remote) :%(branch) | 133 | bind main pd ?git push %(remote) :%(branch) |
134 | bind generic pD ?git push '%(prompt Delete from which remote? )' :'%(prompt Which reference? )' | 134 | bind generic pD ?git push '%(prompt Delete from which remote? )' :'%(prompt Which reference? )' |
135 | 135 | ||
@@ -234,7 +234,7 @@ bind status D ?>git clean -dfx | |||
234 | 234 | ||
235 | # solve conflict | 235 | # solve conflict |
236 | bind status U ?>git reset --hard | 236 | bind status U ?>git reset --hard |
237 | bind status gc @git clean -f | 237 | bind status gc @git clean --force |
238 | bind status Ba @git rebase --abort | 238 | bind status Ba @git rebase --abort |
239 | bind status Bc @git rebase --continue | 239 | bind status Bc @git rebase --continue |
240 | bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\"" | 240 | bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\"" |