diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:12 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:12 +0900 |
| commit | d4a98e701f86bdff469d0f1ed912ba1651c23c3f (patch) | |
| tree | eb44161c938f5325405708c0483abacbbb9ee3fa /Documentation | |
| parent | Merge branch 'pw/post-commit-from-sequencer' (diff) | |
| parent | notes: fix minimum number of parameters to "copy" subcommand (diff) | |
| download | tgif-d4a98e701f86bdff469d0f1ed912ba1651c23c3f.tar.xz | |
Merge branch 'dd/notes-copy-default-dst-to-head'
"git notes copy $original" ought to copy the notes attached to the
original object to HEAD, but a mistaken tightening to command line
parameter validation made earlier disabled that feature by mistake.
* dd/notes-copy-default-dst-to-head:
notes: fix minimum number of parameters to "copy" subcommand
t3301: test diagnose messages for too few/many paramters
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-notes.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index f56a5a9197..ced2e8280e 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] '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' 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>] @@ -68,8 +68,8 @@ add:: subcommand). copy:: - Copy the notes for the first object onto the second object. - Abort if the second object already has notes, or if the first + Copy the notes for the first object onto the second object (defaults to + HEAD). 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: `git notes add [-f] -C $(git notes list <from-object>) <to-object>` |