aboutsummaryrefslogtreecommitdiffhomepage
path: root/tigrc
diff options
context:
space:
mode:
authortypebrook <typebrook@gmail.com>2019-04-13 16:21:48 +0800
committertypebrook <typebrook@gmail.com>2019-04-13 16:21:48 +0800
commitf6581a09b576bf18de0e9c08d907159b5a4e6bbf (patch)
treec0d3af4f13b186421e0aace5f205563c789f5af8 /tigrc
parent7fd509aa03bfe75fd1907b170c52185ae4266c51 (diff)
update
Diffstat (limited to 'tigrc')
-rw-r--r--tigrc4
1 files changed, 2 insertions, 2 deletions
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:
84# merge 84# merge
85bind main m ?git merge %(commit) 85bind main m ?git merge %(commit)
86bind main M ?git merge %(branch) --no-ff 86bind main M ?git merge %(branch) --no-ff
87bind main gm ?git merge %(repo:remote) 87bind main gm ?git merge %(remote)/%(branch)
88bind main gM ?git merge %(repo:remote) --no-ff 88bind main gM ?git merge %(remote)/%(branch) --no-ff
89 89
90# push 90# push
91bind main p none 91bind main p none