mirror of
https://github.com/fofolee/uTools-Manuals.git
synced 2025-06-29 21:12:42 +08:00
5 lines
23 KiB
HTML
5 lines
23 KiB
HTML
<div class="c-markdown doc-markdown"><div class="doc-postil"><div class="c-markdown"><h2>Name</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>git-notes - Add or inspect object notes</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>Synopsis</h2></div></div><div class="doc-postil"><div class="c-markdown"><pre class="prism-token token language-javascript">git notes [list [<object>]]git notes add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]git notes copy [-f] ( --stdin | <from-object> <to-object> )git notes append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]git notes edit [--allow-empty] [<object>]git notes show [<object>]git notes merge [-v | -q] [-s <strategy> ] <notes-ref>git notes merge --commit [-v | -q]git notes merge --abort [-v | -q]git notes remove [--ignore-missing] [--stdin] [<object>…]git notes prune [-n | -v]git notes get-ref</pre></div></div><div class="doc-postil"><div class="c-markdown"><h2>Description</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>Adds, removes, or reads notes attached to objects, without touching the objects themselves.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>By default, notes are saved to and read from <code>refs/notes/commits</code>, but this default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below. If this ref does not exist, it will be quietly created when it is first needed to store a note.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by <code>git log</code> along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying "Notes (<refname>):" (or "Notes:" for <code>refs/notes/commits</code>).</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Notes can also be added to patches prepared with <code>git format-patch</code> by using the <code>--notes</code> option. Such notes are added as a patch commentary after a three dash separator line.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>To change which notes are shown by <code>git log</code>, see the "notes.displayRef" configuration in git-log[1].</p></div></div><div class="doc-postil"><div class="c-markdown"><p>See the "notes.rewrite.<command>" configuration for a way to carry notes across commands that rewrite commits.</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>Subcommands</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>list</p></div></div><div class="doc-postil"><div class="c-markdown"><p>List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format "<note object> <annotated object>"). This is the default subcommand if no subcommand is given.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>add</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use <code>-f</code> to overwrite existing notes). However, if you’re using <code>add</code> interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the <code>edit</code> subcommand).</p></div></div><div class="doc-postil"><div class="c-markdown"><p>copy</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Copy the notes for the first object onto the second object. Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: <code>git notes add [-f] -C $(git notes list <from-object>) <to-object></code></p></div></div><div class="doc-postil"><div class="c-markdown"><p>In <code>--stdin</code> mode, take lines in the format</p></div></div><div class="doc-postil"><div class="c-markdown"><pre class="prism-token token language-javascript"><from-object> SP <to-object> [ SP <rest> ] LF</pre></div></div><div class="doc-postil"><div class="c-markdown"><p>on standard input, and copy the notes from each <from-object> to its corresponding <to-object>. (The optional <code><rest></code> is ignored so that the command can read the input given to the <code>post-rewrite</code> hook.)</p></div></div><div class="doc-postil"><div class="c-markdown"><p>append</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Append to the notes of an existing object (defaults to HEAD). Creates a new notes object if needed.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>edit</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Edit the notes for a given object (defaults to HEAD).</p></div></div><div class="doc-postil"><div class="c-markdown"><p>show</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Show the notes for a given object (defaults to HEAD).</p></div></div><div class="doc-postil"><div class="c-markdown"><p>merge</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Merge the given notes ref into the current notes ref. This will try to merge the changes made by the given notes ref (called "remote") since the merge-base (if any) into the current notes ref (called "local").</p></div></div><div class="doc-postil"><div class="c-markdown"><p>If conflicts arise and a strategy for automatically resolving conflicting notes (see the "NOTES MERGE STRATEGIES" section) is not given, the "manual" resolver is used. This resolver checks out the conflicting notes in a special worktree (<code>.git/NOTES_MERGE_WORKTREE</code>), and instructs the user to manually resolve the conflicts there. When done, the user can either finalize the merge with <code>git notes merge --commit</code>, or abort the merge with <code>git notes merge --abort</code>.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>remove</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the <code>edit</code> subcommand.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>prune</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Remove all notes for non-existing/unreachable objects.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>get-ref</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts).</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>Options</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>-f --force</p></div></div><div class="doc-postil"><div class="c-markdown"><p>When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting).</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-m <msg> --message=<msg></p></div></div><div class="doc-postil"><div class="c-markdown"><p>Use the given note message (instead of prompting). If multiple <code>-m</code> options are given, their values are concatenated as separate paragraphs. Lines starting with <code>#</code> and empty lines other than a single line between paragraphs will be stripped out.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-F <file> --file=<file></p></div></div><div class="doc-postil"><div class="c-markdown"><p>Take the note message from the given file. Use <code>-</code> to read the note message from the standard input. Lines starting with <code>#</code> and empty lines other than a single line between paragraphs will be stripped out.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-C <object> --reuse-message=<object></p></div></div><div class="doc-postil"><div class="c-markdown"><p>Take the given blob object (for example, another note) as the note message. (Use <code>git notes copy <object></code> instead to copy notes between objects.)</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-c <object> --reedit-message=<object></p></div></div><div class="doc-postil"><div class="c-markdown"><p>Like <code>-C</code>, but with <code>-c</code> the editor is invoked, so that the user can further edit the note message.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>--allow-empty</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Allow an empty note object to be stored. The default behavior is to automatically remove empty notes.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>--ref <ref></p></div></div><div class="doc-postil"><div class="c-markdown"><p>Manipulate the notes tree in <ref>. This overrides <code>GIT_NOTES_REF</code> and the "core.notesRef" configuration. The ref specifies the full refname when it begins with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise <code>refs/notes/</code> is prefixed to form a full name of the ref.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>--ignore-missing</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Do not consider it an error to request removing notes from an object that does not have notes attached to it.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>--stdin</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line).</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-n --dry-run</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Do not remove anything; just report the object names whose notes would be removed.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-s <strategy> --strategy=<strategy></p></div></div><div class="doc-postil"><div class="c-markdown"><p>When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: "manual" (default), "ours", "theirs", "union" and "cat_sort_uniq". This option overrides the "notes.mergeStrategy" configuration setting. See the "NOTES MERGE STRATEGIES" section below for more information on each notes merge strategy.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>--commit</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Finalize an in-progress <code>git notes merge</code>. Use this option when you have resolved the conflicts that <code>git notes merge</code> stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by <code>git notes merge</code> (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>--abort</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Abort/reset a in-progress <code>git notes merge</code>, i.e. a notes merge with conflicts. This simply removes all files related to the notes merge.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-q --quiet</p></div></div><div class="doc-postil"><div class="c-markdown"><p>When merging notes, operate quietly.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>-v --verbose</p></div></div><div class="doc-postil"><div class="c-markdown"><p>When merging notes, be more verbose. When pruning notes, report all object names whose notes are removed.</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>Discussion</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>Commit notes are blobs containing extra information about an object (usually information to supplement a commit’s message). These blobs are taken from notes refs. A notes ref is usually a branch which contains "files" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons [1].</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., <code>git log -p notes/commits</code>. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see git-commit[1]). These details may change in the future.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with <code>git log -p -g <refname></code>.</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>Notes merge strategies</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>The default notes merge strategy is "manual", which checks out conflicting notes in a special work tree for resolving notes conflicts (<code>.git/NOTES_MERGE_WORKTREE</code>), and instructs the user to resolve the conflicts in that work tree. When done, the user can either finalize the merge with <code>git notes merge --commit</code>, or abort the merge with <code>git notes merge --abort</code>.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:</p></div></div><div class="doc-postil"><div class="c-markdown"><p>"ours" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref).</p></div></div><div class="doc-postil"><div class="c-markdown"><p>"theirs" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref).</p></div></div><div class="doc-postil"><div class="c-markdown"><p>"union" automatically resolves notes conflicts by concatenating the local and remote versions.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>"cat_sort_uniq" is similar to "union", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the "cat | sort | uniq" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result. Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy.</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>Examples</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>You can use notes to add annotations with information that was not available at the time a commit was written.</p></div></div><div class="doc-postil"><div class="c-markdown"><pre class="prism-token token language-javascript">$ git notes add -m 'Tested-by: Johannes Sixt <j6t@kdbg.org>' 72a144e2
|
||
|
||
$ git show -s 72a144e[...]
|
||
|
||
Signed-off-by: Junio C Hamano <gitster@pobox.com>Notes:
|
||
|
||
Tested-by: Johannes Sixt <j6t@kdbg.org></pre></div></div><div class="doc-postil"><div class="c-markdown"><p>In principle, a note is a regular Git blob, and any kind of (non-)format is accepted. You can binary-safely create notes from arbitrary files using <code>git hash-object</code>:</p></div></div><div class="doc-postil"><div class="c-markdown"><pre class="prism-token token language-javascript">$ cc *.c
|
||
|
||
$ blob=$(git hash-object -w a.out)$ git notes --ref=built add --allow-empty -C "$blob" HEAD</pre></div></div><div class="doc-postil"><div class="c-markdown"><p>(You cannot simply use <code>git notes --ref=built add -F a.out HEAD</code> because that is not binary-safe.) Of course, it doesn’t make much sense to display non-text-format notes with <code>git log</code>, so if you use such notes, you’ll probably need to write some special-purpose tools to do something useful with them.</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>Configuration</h2></div></div><div class="doc-postil"><div class="c-markdown"><p>core.notesRef</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Notes ref to read and manipulate instead of <code>refs/notes/commits</code>. Must be an unabbreviated ref name. This setting can be overridden through the environment and command line.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>notes.mergeStrategy</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Which merge strategy to choose by default when resolving notes conflicts. Must be one of <code>manual</code>, <code>ours</code>, <code>theirs</code>, <code>union</code>, or <code>cat_sort_uniq</code>. Defaults to <code>manual</code>. See "NOTES MERGE STRATEGIES" section above for more information on each strategy.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>This setting can be overridden by passing the <code>--strategy</code> option.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>notes.<name>.mergeStrategy</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Which merge strategy to choose when doing a notes merge into refs/notes/<name>. This overrides the more general "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section above for more information on each available strategy.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>notes.displayRef</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Which ref (or refs, if a glob or specified more than once), in addition to the default set by <code>core.notesRef</code> or <code>GIT_NOTES_REF</code>, to read notes from when showing commit messages with the <code>git log</code> family of commands. This setting can be overridden on the command line or by the <code>GIT_NOTES_DISPLAY_REF</code> environment variable. See git-log[1].</p></div></div><div class="doc-postil"><div class="c-markdown"><p>notes.rewrite.<command></p></div></div><div class="doc-postil"><div class="c-markdown"><p>When rewriting commits with <command> (currently <code>amend</code> or <code>rebase</code>), if this variable is <code>false</code>, git will not copy notes from the original to the rewritten commit. Defaults to <code>true</code>. See also "<code>notes.rewriteRef</code>" below.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>This setting can be overridden by the <code>GIT_NOTES_REWRITE_REF</code> environment variable.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>notes.rewriteMode</p></div></div><div class="doc-postil"><div class="c-markdown"><p>When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of <code>overwrite</code>, <code>concatenate</code>, <code>cat_sort_uniq</code>, or <code>ignore</code>. Defaults to <code>concatenate</code>.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_MODE</code> environment variable.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>notes.rewriteRef</p></div></div><div class="doc-postil"><div class="c-markdown"><p>When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied. May be a glob, in which case notes in all matching refs will be copied. You may also specify this configuration several times.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Does not have a default value; you must configure this variable to enable note rewriting.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>Can be overridden with the <code>GIT_NOTES_REWRITE_REF</code> environment variable.</p></div></div><div class="doc-postil"><div class="c-markdown"><h2>Environment</h2></div></div><div class="doc-postil"><div class="c-markdown"><p><code>GIT_NOTES_REF</code></p></div></div><div class="doc-postil"><div class="c-markdown"><p>Which ref to manipulate notes from, instead of <code>refs/notes/commits</code>. This overrides the <code>core.notesRef</code> setting.</p></div></div><div class="doc-postil"><div class="c-markdown"><p><code>GIT_NOTES_DISPLAY_REF</code></p></div></div><div class="doc-postil"><div class="c-markdown"><p>Colon-delimited list of refs or globs indicating which refs, in addition to the default from <code>core.notesRef</code> or <code>GIT_NOTES_REF</code>, to read notes from when showing commit messages. This overrides the <code>notes.displayRef</code> setting.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored.</p></div></div><div class="doc-postil"><div class="c-markdown"><p><code>GIT_NOTES_REWRITE_MODE</code></p></div></div><div class="doc-postil"><div class="c-markdown"><p>When copying notes during a rewrite, what to do if the target commit already has a note. Must be one of <code>overwrite</code>, <code>concatenate</code>, <code>cat_sort_uniq</code>, or <code>ignore</code>. This overrides the <code>core.rewriteMode</code> setting.</p></div></div><div class="doc-postil"><div class="c-markdown"><p><code>GIT_NOTES_REWRITE_REF</code></p></div></div><div class="doc-postil"><div class="c-markdown"><p>When rewriting commits, which notes to copy from the original to the rewritten commit. Must be a colon-delimited list of refs or globs.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>If not set in the environment, the list of notes to copy depends on the <code>notes.rewrite.<command></code> and <code>notes.rewriteRef</code> settings.</p></div></div><div class="doc-postil"><div class="c-markdown"><p>1. Permitted pathnames have the form <em style="font-style: italic;">ab</em><code>/</code><em style="font-style: italic;">cd</em><code>/</code><em style="font-style: italic;">ef</em><code>/</code><em style="font-style: italic;">…</em><code>/</code><em style="font-style: italic;">abcdef…</em>: a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.</p></div></div><div class="doc-postil"><div class="c-markdown"><pre class="prism-token token language-js"> © 2005–2017 Linus Torvalds and others</pre></div></div><div class="doc-postil"><div class="c-markdown"><p>Licensed under the GNU General Public License version 2.</p></div></div></div> |