delta/git.git/Documentation/git-rev-parse.txt, branch fc/mergetools-vimdiff3

Merge branch 'jc/ref-excludes'

2013-12-05T20:59:09+00:00

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:45+00:00

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:41+00:00

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

Merge branch 'rj/doc-rev-parse'

2013-08-30T17:08:13+00:00

* rj/doc-rev-parse:
  rev-parse(1): logically group options
  rev-parse: remove restrictions on some options

typofix: documentation

2013-07-22T23:06:48+00:00

Signed-off-by: Ondřej Bílka 
Signed-off-by: Junio C Hamano

rev-parse(1): logically group options

2013-07-22T17:43:21+00:00

The options section of the git-rev-parse manual page has grown
organically so that there now does not seem to be much logic behind the
ordering of the options.  It also does not make it clear that certain
options must appear first on the command line.

Address this by reorganising the options into groups with subheadings.
The text of option descriptions does not change.

Signed-off-by: John Keeping 
Signed-off-by: Junio C Hamano

rev-parse: add --prefix option

2013-06-17T20:30:01+00:00

This makes 'git rev-parse' behave as if it were invoked from the
specified subdirectory of a repository, with the difference that any
file paths which it prints are prefixed with the full path from the top
of the working tree.

This is useful for shell scripts where we may want to cd to the top of
the working tree but need to handle relative paths given by the user on
the command line.

Signed-off-by: John Keeping 
Signed-off-by: Junio C Hamano

Merge branch 'ta/glossary'

2013-04-22T01:40:15+00:00

* ta/glossary:
  glossary: improve definitions of refspec and pathspec
  The name of the hash function is "SHA-1", not "SHA1"
  glossary: improve description of SHA-1 related topics
  glossary: remove outdated/misleading/irrelevant entries

The name of the hash function is "SHA-1", not "SHA1"

2013-04-15T18:08:37+00:00

Use "SHA-1" instead of "SHA1" whenever we talk about the hash function.
When used as a programming symbol, we keep "SHA1".

Signed-off-by: Thomas Ackermann 
Signed-off-by: Junio C Hamano

Merge branch 'mh/rev-parse-verify-doc'

2013-04-05T21:15:20+00:00

"rev-parse --verify" was documented in a misleading way.

* mh/rev-parse-verify-doc:
  rev-parse: clarify documentation for the --verify option