git/Documentation/git-rev-parse.txt, branch v2.0.3

Merge branch 'maint-1.9' into maint

2014-07-22T17:17:34Z

* maint-1.9: Documentation: fix missing text for rev-parse --verify

Merge branch 'maint-1.8.5' into maint-1.9

2014-07-22T17:16:50Z

* maint-1.8.5: Documentation: fix missing text for rev-parse --verify

Documentation: fix missing text for rev-parse --verify

2014-07-22T17:10:57Z

The caret (^) is used as a markup symbol in AsciiDoc. Due to the inability of AsciiDoc to parse a line containing an unmatched caret, it omitted the line from the output, resulting in the man page missing the end of a sentence. Escape this caret so that the man page ends up with the complete text. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Merge branch 'ib/rev-parse-parseopt-argh'

2014-04-08T19:00:09Z

Finishing touch to a new topic scheduled for 2.0. * ib/rev-parse-parseopt-argh: rev-parse: fix typo in example on manpage

rev-parse: fix typo in example on manpage

2014-04-01T21:07:46Z

Signed-off-by: Junio C Hamano

parse-options: multi-word argh should use dash to separate words

2014-03-24T17:43:34Z

"When you need to use space, use dash" is a strange way to say that you must not use a space. Because it is more common for the command line descriptions to use dashed-multi-words, you do not even want to use spaces in these places. Rephrase the documentation to avoid this strangeness. Fix a few existing multi-word argument help strings, i.e. - GPG key-ids given to -S/--gpg-sign are "key-id"; - Refs used for storing notes are "notes-ref"; and - Expiry timestamps given to --expire are "expiry-date". and update the corresponding documentation pages. Signed-off-by: Junio C Hamano

rev-parse --parseopt: option argument name hints

2014-03-24T00:28:03Z

Built-in commands can specify names for option arguments when usage text is generated for a command. sh based commands should be able to do the same. Option argument name hint is any text that comes after [*=?!] after the argument name up to the first whitespace. Signed-off-by: Ilya Bobyr Signed-off-by: Junio C Hamano

Merge branch 'jc/ref-excludes'

2013-12-05T20:59:09Z

People often wished a way to tell "git log --branches" (and "git log --remotes --not --branches") to exclude some local branches from the expansion of "--branches" (similarly for "--tags", "--all" and "--glob="). Now they have one. * jc/ref-excludes: rev-parse: introduce --exclude= to tame wildcards rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API rev-list --exclude: tests document --exclude option revision: introduce --exclude= to tame wildcards

rev-parse: introduce --exclude= to tame wildcards

2013-11-01T20:09:45Z

Teach "rev-parse" the same "I'm going to glob, but omit the ones that match these patterns" feature as "rev-list". Signed-off-by: Junio C Hamano

rev-parse --parseopt: add the --stuck-long mode

2013-10-31T22:47:41Z

Add the --stuck-long option to output the options in their long form if available, and with their arguments stuck. Contrary to the default form (non stuck arguments and short options), this can be parsed unambiguously when using options with optional arguments : - in the non stuck form, when an option is taking an optional argument you cannot know if the next argument is its optional argument, or the next option. - the long options form allows to differentiate between an empty argument '--option=' and an unset argument '--option', which is not possible with short options. Signed-off-by: Nicolas Vigier Signed-off-by: Junio C Hamano