Merge branch 'jc/rev-parse-argh-dashed-multi-words'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 18:59:27 +0000 (8 11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2014 18:59:27 +0000 (8 11:59 -0700)
Make sure that the help text given to describe the "<param>" part
of the "git cmd --option=<param>" does not contain SP or _,
e.g. "--gpg-sign=<key-id>" option for "git commit" is not spelled
as "--gpg-sign=<key id>".

* jc/rev-parse-argh-dashed-multi-words:
  parse-options: make sure argh string does not have SP or _
  update-index: teach --cacheinfo a new syntax "mode,sha1,path"
  parse-options: multi-word argh should use dash to separate words

1  2 
Documentation/git-commit.txt
builtin/checkout.c
builtin/commit.c
builtin/merge.c

Simple merge
Simple merge
Simple merge
diff --cc builtin/merge.c
Simple merge