From aa2fb8aee76c16e82bba7228644d320972d9350d Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 20 May 2019 09:08:46 +0800 Subject: update --- tigrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tigrc') diff --git a/tigrc b/tigrc index 65591b9..4843a36 100644 --- a/tigrc +++ b/tigrc @@ -96,10 +96,10 @@ bind main a !>git commit --amend 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 %(remote)/%(branch) # merge with current remote -bind main gM ?git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote +bind main m ?@git merge %(commit) +bind main M ?@git merge %(branch) --no-ff +bind main gm ?@git merge %(remote)/%(branch) # merge with current remote +bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote # push bind main p none # override default pager binding -- cgit v1.2.3-70-g09d2