From f6581a09b576bf18de0e9c08d907159b5a4e6bbf Mon Sep 17 00:00:00 2001 From: typebrook Date: Sat, 13 Apr 2019 16:21:48 +0800 Subject: update --- alias | 1 + tigrc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/alias b/alias index d0b152f..fe34f53 100644 --- a/alias +++ b/alias @@ -89,6 +89,7 @@ alias ta='tig --all' alias ts='tig status' alias tl='tig log' alias ty='tig stash' +alias tigr='tig refs' # Android alias debug='./gradlew app:installDebug && adb shell am start -n com.geothings.geobingan/.MainActivity_' diff --git a/tigrc b/tigrc index bff32ad..355a24f 100644 --- a/tigrc +++ b/tigrc @@ -84,8 +84,8 @@ bind main 3 >git commit --allow-empty -m "%(prompt Empty commit, enter message: # merge bind main m ?git merge %(commit) bind main M ?git merge %(branch) --no-ff -bind main gm ?git merge %(repo:remote) -bind main gM ?git merge %(repo:remote) --no-ff +bind main gm ?git merge %(remote)/%(branch) +bind main gM ?git merge %(remote)/%(branch) --no-ff # push bind main p none -- cgit v1.2.3-70-g09d2