Thread (72 messages) flat view 72 messages, 20 authors, 2016-06-15

Re: [PATCH] Teach git-merge to pass -X<option> to the backend strategy module

From: Jakub Narebski <hidden>
Date: 2016-06-15 22:44:51

Junio C Hamano wrote:
quoted hunk ↗ jump to hunk
diff --git a/git-merge.sh b/git-merge.sh
index 39b5cd9..d475852 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -17,6 +17,7 @@ commit               perform a commit if the merge succeeds (default)
 ff                   allow fast forward (default)
 s,strategy=          merge strategy to use
 m,message=           message to be used for the merge commit (if any)
+X=                   pass merge strategy specific options
 "
You have updated usage for git-merge, but didn't update manpages
(Documentation).

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help