Junio C Hamano wrote: > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
