From 600334628294fbcd6406b55a9a17d270371cb7e5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 3 May 2011 00:48:43 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.7.5-185-g0b9dee --- RelNotes/1.7.6.txt | 20 +++++++++++++++----- git-diff-tree.html | 42 ++++++++++++++++++++++++++++++------------ git-log.html | 48 +++++++++++++++++++++++++++++++++--------------- git-log.txt | 4 ++-- git-notes.html | 9 ++++++--- git-notes.txt | 7 +++++-- git-rev-list.html | 42 ++++++++++++++++++++++++++++++------------ git-show.html | 42 ++++++++++++++++++++++++++++++------------ git-submodule.html | 8 +++++--- git-submodule.txt | 6 ++++-- git-whatchanged.html | 42 ++++++++++++++++++++++++++++++------------ pretty-options.txt | 35 +++++++++++++++++++++++++---------- 12 files changed, 215 insertions(+), 90 deletions(-) diff --git a/RelNotes/1.7.6.txt b/RelNotes/1.7.6.txt index a092f0899a..fbbc5b447e 100644 --- a/RelNotes/1.7.6.txt +++ b/RelNotes/1.7.6.txt @@ -6,6 +6,9 @@ Updates since v1.7.5 * Various git-svn updates. + * Clean-up of the C part of i18n (but not l10n---please wait) + continues. + * When an object "$tree:$path" does not exist, if $path does exist in the subtree of $tree that corresponds to the subdirectory the user is in, git now suggests using "$tree:./$path" in addition to the advice to use @@ -26,6 +29,10 @@ Updates since v1.7.5 * "git format-patch" learned "--quiet" option to suppress the output of the names of generated files. + * "git log" and friends learned a new "--notes" option to replace the + "--show-notes" option. Unlike "--show-notes", "--notes=" does + not imply showing the default notes. + * "git merge" learned "-" as a short-hand for "the previous branch", just like the way "git checkout -" works. @@ -37,6 +44,9 @@ Updates since v1.7.5 * "git stash apply" can now apply to a working tree with changes as long as there is no overlapping change as the stash being applied. + * "git submodule update" learned "--force" option to get rid of local + changes in submodules and replace them with the up-to-date version. + * "git stash apply @{99999}" now is diagnosed as an error, unless you really have that many stash entries. @@ -49,10 +59,6 @@ Fixes since v1.7.5 Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are included in this release. - * The "--date=relative" output format used to say "X years, 12 months" - when it should have said "X+1 years". - (merge mg/x-years-12-months later) - * "git config" used to choke with an insanely long line. (merge ef/maint-strbuf-init later) @@ -65,6 +71,10 @@ included in this release. when renames are involved. (merge jh/dirstat for the above two later) + * "diff -M --cached" used to use unmerged path as a possible rename + source candidate, which made no sense. + (merge mz/maint-rename-unmerged later) + * "git format-patch" when run with "--quiet" option used to produce a nonsense result that consists of alternating empty output. (merge early part of cn/format-patch-quiet later) @@ -80,5 +90,5 @@ included in this release. --- exec >/var/tmp/1 echo O=$(git describe master) -O=v1.7.5-140-g5ae6f5c +O=v1.7.5-184-g23f536c git shortlog --no-merges ^maint ^$O master diff --git a/git-diff-tree.html b/git-diff-tree.html index 61e116b5ea..d60485262d 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1228,31 +1228,49 @@ people using 80-column terminals.

---no-notes -
-
---show-notes[=<ref>] +--notes[=<ref>]

Show the notes (see git-notes(1)) that annotate the commit, when showing the commit log message. This is the default for git log, git show and git whatchanged commands when - there is no --pretty, --format nor --oneline option is - given on the command line. + there is no --pretty, --format nor --oneline option given + on the command line. +

+

By default, the notes shown are from the notes refs listed in the +core.notesRef and notes.displayRef variables (or corresponding +environment overrides). See git-config(1) for more details.

+

With an optional <ref> argument, show this notes ref instead of the +default notes ref(s). The ref is taken to be in refs/notes/ if it +is not qualified.

+

Multiple --notes options can be combined to control which notes are +being displayed. Examples: "--notes=foo" will show only notes from +"refs/notes/foo"; "--notes=foo --notes" will show both notes from +"refs/notes/foo" and from the default notes ref(s).

+
+
+--no-notes +
+
+

+ Do not show notes. This negates the above --notes option, by + resetting the list of notes refs from which notes are shown. + Options are parsed in the order given on the command line, so e.g. + "--notes --notes=foo --no-notes --notes=bar" will only show notes + from "refs/notes/bar".

-

With an optional argument, add this ref to the list of notes. The ref -is taken to be in refs/notes/ if it is not qualified.

+--show-notes[=<ref>] +
+
--[no-]standard-notes

- Enable or disable populating the notes ref list from the - core.notesRef and notes.displayRef variables (or - corresponding environment overrides). Enabled by default. - See git-config(1). + These options are deprecated. Use the above --notes/--no-notes + options instead.

diff --git a/git-log.html b/git-log.html index 70a0bb6894..83376afddf 100644 --- a/git-log.html +++ b/git-log.html @@ -1365,31 +1365,49 @@ people using 80-column terminals.

---no-notes -
-
---show-notes[=<ref>] +--notes[=<ref>]

Show the notes (see git-notes(1)) that annotate the commit, when showing the commit log message. This is the default for git log, git show and git whatchanged commands when - there is no --pretty, --format nor --oneline option is - given on the command line. + there is no --pretty, --format nor --oneline option given + on the command line. +

+

By default, the notes shown are from the notes refs listed in the +core.notesRef and notes.displayRef variables (or corresponding +environment overrides). See git-config(1) for more details.

+

With an optional <ref> argument, show this notes ref instead of the +default notes ref(s). The ref is taken to be in refs/notes/ if it +is not qualified.

+

Multiple --notes options can be combined to control which notes are +being displayed. Examples: "--notes=foo" will show only notes from +"refs/notes/foo"; "--notes=foo --notes" will show both notes from +"refs/notes/foo" and from the default notes ref(s).

+
+
+--no-notes +
+
+

+ Do not show notes. This negates the above --notes option, by + resetting the list of notes refs from which notes are shown. + Options are parsed in the order given on the command line, so e.g. + "--notes --notes=foo --no-notes --notes=bar" will only show notes + from "refs/notes/bar".

-

With an optional argument, add this ref to the list of notes. The ref -is taken to be in refs/notes/ if it is not qualified.

+--show-notes[=<ref>] +
+
--[no-]standard-notes

- Enable or disable populating the notes ref list from the - core.notesRef and notes.displayRef variables (or - corresponding environment overrides). Enabled by default. - See git-config(1). + These options are deprecated. Use the above --notes/--no-notes + options instead.

@@ -3064,9 +3082,9 @@ notes.displayRef

May be an unabbreviated ref name or a glob and may be specified multiple times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored.

-

This setting can be disabled by the --no-standard-notes option, +

This setting can be disabled by the --no-notes option, overridden by the GIT_NOTES_DISPLAY_REF environment variable, -and supplemented by the --show-notes option.

+and overridden by the --notes=<ref> option.

@@ -3076,7 +3094,7 @@ and supplemented by the --show-notes option.

diff --git a/git-log.txt b/git-log.txt index 2c84028838..de5c0d37a5 100644 --- a/git-log.txt +++ b/git-log.txt @@ -178,9 +178,9 @@ May be an unabbreviated ref name or a glob and may be specified multiple times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored. + -This setting can be disabled by the `--no-standard-notes` option, +This setting can be disabled by the `--no-notes` option, overridden by the 'GIT_NOTES_DISPLAY_REF' environment variable, -and supplemented by the `--show-notes` option. +and overridden by the `--notes=` option. GIT --- diff --git a/git-notes.html b/git-notes.html index 850dff9be6..dca881b264 100644 --- a/git-notes.html +++ b/git-notes.html @@ -469,8 +469,11 @@ add

Add notes for a given object (defaults to HEAD). Abort if the - object already has notes (use -f to overwrite an - existing note). + object already has notes (use -f to overwrite existing notes). + However, if you’re using add interactively (using an editor + to supply the notes contents), then - instead of aborting - + the existing notes will be opened in the editor (like the edit + subcommand).

@@ -930,7 +933,7 @@ Johan Herland <johan@herland.net> diff --git a/git-notes.txt b/git-notes.txt index 296f314eae..913ecd8c43 100644 --- a/git-notes.txt +++ b/git-notes.txt @@ -57,8 +57,11 @@ list:: add:: Add notes for a given object (defaults to HEAD). Abort if the - object already has notes (use `-f` to overwrite an - existing note). + object already has notes (use `-f` to overwrite existing notes). + However, if you're using `add` interactively (using an editor + to supply the notes contents), then - instead of aborting - + the existing notes will be opened in the editor (like the `edit` + subcommand). copy:: Copy the notes for the first object onto the second object. diff --git a/git-rev-list.html b/git-rev-list.html index 3d237a0cab..bd34f7cc35 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1435,31 +1435,49 @@ people using 80-column terminals.

---no-notes -
-
---show-notes[=<ref>] +--notes[=<ref>]

Show the notes (see git-notes(1)) that annotate the commit, when showing the commit log message. This is the default for git log, git show and git whatchanged commands when - there is no --pretty, --format nor --oneline option is - given on the command line. + there is no --pretty, --format nor --oneline option given + on the command line. +

+

By default, the notes shown are from the notes refs listed in the +core.notesRef and notes.displayRef variables (or corresponding +environment overrides). See git-config(1) for more details.

+

With an optional <ref> argument, show this notes ref instead of the +default notes ref(s). The ref is taken to be in refs/notes/ if it +is not qualified.

+

Multiple --notes options can be combined to control which notes are +being displayed. Examples: "--notes=foo" will show only notes from +"refs/notes/foo"; "--notes=foo --notes" will show both notes from +"refs/notes/foo" and from the default notes ref(s).

+
+
+--no-notes +
+
+

+ Do not show notes. This negates the above --notes option, by + resetting the list of notes refs from which notes are shown. + Options are parsed in the order given on the command line, so e.g. + "--notes --notes=foo --no-notes --notes=bar" will only show notes + from "refs/notes/bar".

-

With an optional argument, add this ref to the list of notes. The ref -is taken to be in refs/notes/ if it is not qualified.

+--show-notes[=<ref>] +
+
--[no-]standard-notes

- Enable or disable populating the notes ref list from the - core.notesRef and notes.displayRef variables (or - corresponding environment overrides). Enabled by default. - See git-config(1). + These options are deprecated. Use the above --notes/--no-notes + options instead.

diff --git a/git-show.html b/git-show.html index c05193cb2b..48e4c72119 100644 --- a/git-show.html +++ b/git-show.html @@ -495,31 +495,49 @@ people using 80-column terminals.

---no-notes -
-
---show-notes[=<ref>] +--notes[=<ref>]

Show the notes (see git-notes(1)) that annotate the commit, when showing the commit log message. This is the default for git log, git show and git whatchanged commands when - there is no --pretty, --format nor --oneline option is - given on the command line. + there is no --pretty, --format nor --oneline option given + on the command line. +

+

By default, the notes shown are from the notes refs listed in the +core.notesRef and notes.displayRef variables (or corresponding +environment overrides). See git-config(1) for more details.

+

With an optional <ref> argument, show this notes ref instead of the +default notes ref(s). The ref is taken to be in refs/notes/ if it +is not qualified.

+

Multiple --notes options can be combined to control which notes are +being displayed. Examples: "--notes=foo" will show only notes from +"refs/notes/foo"; "--notes=foo --notes" will show both notes from +"refs/notes/foo" and from the default notes ref(s).

+
+
+--no-notes +
+
+

+ Do not show notes. This negates the above --notes option, by + resetting the list of notes refs from which notes are shown. + Options are parsed in the order given on the command line, so e.g. + "--notes --notes=foo --no-notes --notes=bar" will only show notes + from "refs/notes/bar".

-

With an optional argument, add this ref to the list of notes. The ref -is taken to be in refs/notes/ if it is not qualified.

+--show-notes[=<ref>] +
+
--[no-]standard-notes

- Enable or disable populating the notes ref list from the - core.notesRef and notes.displayRef variables (or - corresponding environment overrides). Enabled by default. - See git-config(1). + These options are deprecated. Use the above --notes/--no-notes + options instead.

diff --git a/git-submodule.html b/git-submodule.html index 47b34daf90..8b114b56ba 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -639,8 +639,10 @@ sync

- This option is only valid for the add command. - Allow adding an otherwise ignored submodule path. + This option is only valid for add and update commands. + When running add, allow adding an otherwise ignored submodule path. + When running update, throw away local changes in submodules when + switching to a different commit.

@@ -768,7 +770,7 @@ for details.

diff --git a/git-submodule.txt b/git-submodule.txt index 1a16ff6044..5e7a4130ee 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -186,8 +186,10 @@ OPTIONS -f:: --force:: - This option is only valid for the add command. - Allow adding an otherwise ignored submodule path. + This option is only valid for add and update commands. + When running add, allow adding an otherwise ignored submodule path. + When running update, throw away local changes in submodules when + switching to a different commit. --cached:: This option is only valid for status and summary commands. These diff --git a/git-whatchanged.html b/git-whatchanged.html index 08ee9dbe8c..5e49962e29 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -527,31 +527,49 @@ people using 80-column terminals.

---no-notes -
-
---show-notes[=<ref>] +--notes[=<ref>]

Show the notes (see git-notes(1)) that annotate the commit, when showing the commit log message. This is the default for git log, git show and git whatchanged commands when - there is no --pretty, --format nor --oneline option is - given on the command line. + there is no --pretty, --format nor --oneline option given + on the command line. +

+

By default, the notes shown are from the notes refs listed in the +core.notesRef and notes.displayRef variables (or corresponding +environment overrides). See git-config(1) for more details.

+

With an optional <ref> argument, show this notes ref instead of the +default notes ref(s). The ref is taken to be in refs/notes/ if it +is not qualified.

+

Multiple --notes options can be combined to control which notes are +being displayed. Examples: "--notes=foo" will show only notes from +"refs/notes/foo"; "--notes=foo --notes" will show both notes from +"refs/notes/foo" and from the default notes ref(s).

+
+
+--no-notes +
+
+

+ Do not show notes. This negates the above --notes option, by + resetting the list of notes refs from which notes are shown. + Options are parsed in the order given on the command line, so e.g. + "--notes --notes=foo --no-notes --notes=bar" will only show notes + from "refs/notes/bar".

-

With an optional argument, add this ref to the list of notes. The ref -is taken to be in refs/notes/ if it is not qualified.

+--show-notes[=<ref>] +
+
--[no-]standard-notes

- Enable or disable populating the notes ref list from the - core.notesRef and notes.displayRef variables (or - corresponding environment overrides). Enabled by default. - See git-config(1). + These options are deprecated. Use the above --notes/--no-notes + options instead.

diff --git a/pretty-options.txt b/pretty-options.txt index 50923e2ce9..d5c977262a 100644 --- a/pretty-options.txt +++ b/pretty-options.txt @@ -30,19 +30,34 @@ people using 80-column terminals. preferred by the user. For non plumbing commands this defaults to UTF-8. ---no-notes:: ---show-notes[=]:: +--notes[=]:: Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when - there is no `--pretty`, `--format` nor `--oneline` option is - given on the command line. + there is no `--pretty`, `--format` nor `--oneline` option given + on the command line. ++ +By default, the notes shown are from the notes refs listed in the +'core.notesRef' and 'notes.displayRef' variables (or corresponding +environment overrides). See linkgit:git-config[1] for more details. ++ +With an optional '' argument, show this notes ref instead of the +default notes ref(s). The ref is taken to be in `refs/notes/` if it +is not qualified. + -With an optional argument, add this ref to the list of notes. The ref -is taken to be in `refs/notes/` if it is not qualified. +Multiple --notes options can be combined to control which notes are +being displayed. Examples: "--notes=foo" will show only notes from +"refs/notes/foo"; "--notes=foo --notes" will show both notes from +"refs/notes/foo" and from the default notes ref(s). +--no-notes:: + Do not show notes. This negates the above `--notes` option, by + resetting the list of notes refs from which notes are shown. + Options are parsed in the order given on the command line, so e.g. + "--notes --notes=foo --no-notes --notes=bar" will only show notes + from "refs/notes/bar". + +--show-notes[=]:: --[no-]standard-notes:: - Enable or disable populating the notes ref list from the - 'core.notesRef' and 'notes.displayRef' variables (or - corresponding environment overrides). Enabled by default. - See linkgit:git-config[1]. + These options are deprecated. Use the above --notes/--no-notes + options instead. -- 2.11.4.GIT