git/Documentation/git-notes.txt, branch v1.7.3.4

notes: allow --dry-run for -n and --verbose for -v

2010-08-09T17:12:50Z

For consistency with other git commands, let the prune subcommand of git notes accept the long options --dry-run and --verbose for the respective short ones -n and -v. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'mg/notes-dry-run'

2010-06-13T18:22:39Z

* mg/notes-dry-run: notes: dry-run and verbose options for prune

notes: dry-run and verbose options for prune

2010-05-20T06:57:18Z

Introduce -n and -v options for "git notes prune" in complete analogy to "git prune" so that one can check for dangling notes easily. The output is a list of names of objects whose notes would be resp. are removed so that one can check the object ("git show sha1") as well as the note ("git notes show sha1"). Signed-off-by: Michael J Gruber Acked-by: Johan Herland Signed-off-by: Junio C Hamano

Documentation/notes: nitpicks

2010-05-09T05:30:03Z

Spell out “or” in the NAME line and simplify the leading sentence in the DESCRIPTION. Some other language cleanups, too. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Documentation/notes: clean up description of rewriting configuration

2010-05-09T05:30:03Z

Clarify that the GIT_NOTES_REWRITE_REFS environment variable overrides both ‘[notes "rewrite"] ’ and ‘[notes] rewriteRef’. Add explanations of GIT_NOTES_REWRITE_MODE and GIT_NOTES_REWRITE_REFS to the ENVIRONMENT section. Cc: Leif Arne Storset Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Documentation/notes: simplify treatment of default display refs

2010-05-09T05:30:03Z

The main description of display refs for notes should be in git-log.1, where there is a chance to give a leisurely description of all the ways they can be set, what they are used for, and so on. The description in git-notes.1 is only meant to be a quick reminder of how notes are used. So simplify it. Also add an entry for GIT_NOTES_DISPLAY_REF to the environment section. Cc: Thomas Rast Cc: Johan Herland Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Documentation/notes: simplify treatment of default notes ref

2010-05-09T05:30:02Z

Separate the documentation of the semantics, command-line option, configuration item, and environment variable for the default notes ref. The documentation is easier to digest in bite-sized pieces. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Documentation/notes: add configuration section

2010-05-09T05:30:02Z

Copy the descriptions of configuration variables from git-config.1. Once the descriptions have been ironed out, it would be nice to refactor them to share text, but for now it is simplest to experiment with separate copies. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Documentation/notes: describe content of notes blobs

2010-05-09T05:30:02Z

stripspace/text-based formatting kicks in when specifying the notes content with -m or -F, or when an editor is used to edit the notes. To binary-safely create notes from files, the following construct is required: git notes add -C $(git hash-object -w ) Explain this trick (thanks, Johan!) in the manual. Add an ordinary example, too, to keep this esoteric one company. Cc: Johan Herland Cc: Thomas Rast Cc: Jeff King Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Documentation/notes: document format of notes trees

2010-05-09T05:30:02Z

Separate the specification of the notes format exposed in git-config.1 from the description of the option; or in other words, move the explanation for what to expect to find at refs/notes/commits from git-config.1 to git-notes.1. Suggested-by: Thomas Rast Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano