From baa590296e111f2553752a864feeebd512be3c25 Mon Sep 17 00:00:00 2001 From: typebrook Date: Thu, 2 May 2019 16:51:32 +0800 Subject: update --- tigrc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tigrc') diff --git a/tigrc b/tigrc index 98c8cf2..a486093 100644 --- a/tigrc +++ b/tigrc @@ -29,8 +29,7 @@ bind generic gp view-grep # toggle case sensitive for search bind generic w :toggle ignore-case -# override refresh -bind generic R none +# refresh like modern browser bind generic refresh # see reflog, reset refernece @@ -70,6 +69,7 @@ bind main ; :goto %(commit)^2 bind main b none bind main bn @git branch "%(prompt Enter branch name: )" %(commit) bind main bN @git branch "%(prompt Enter branch name: )" --track %(remote)/%(branch) +bind main bc @git checkout -b "%(prompt Checkout at new branch: )" %(commit) bind main bd @git branch -d "%(prompt Delete branch: )" bind main bbd @git branch -d %(branch) bind main bD ?>git branch -D "%(prompt Delete branch anyway: )" @@ -80,7 +80,6 @@ bind main c @sh -c "git branch --points-at=%(commit) | \ (cat -; echo %(commit)) | \ head -1 | \ xargs git checkout" -bind main B @git checkout -b "%(prompt Enter branch name: )" %(commit) # commit bind main a ?>git commit --amend @@ -111,7 +110,7 @@ bind main pU ?git pull '%(prompt Which remote? )' %(branch):%(branch) bind main uu ?git reset %(commit) bind main us ?sh -c "git reset %(commit) && git stash push -m 'deprecated from reset'" bind main uh ?git reset %(commit) --hard -bind main R !?git rebase -i %(commit) +bind main B !?git rebase -i %(commit) bind main ! ?git revert %(commit) # tag @@ -181,8 +180,8 @@ bind status d ?>rm %(file) # solve conflict bind status U ?>git reset --hard bind status gc @git clean -f -bind status Ra @git rebase --abort -bind status Rc @git rebase --continue +bind status Ba @git rebase --abort +bind status Bc @git rebase --continue bind status !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\"" bind status Tu @git update-index --assume-unchanged %(file) -- cgit v1.2.3-70-g09d2