diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-02 15:58:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-02 15:58:32 -0700 |
| commit | 2d23c64ba2e91029f4ce932117a1772378d63cf3 (patch) | |
| tree | 3ed1df7f43cbb310aab98f6f57e61011fe1c11c0 /Documentation | |
| parent | c67e367c50304c5a0701ae2bb8ecb7291f481ffd (diff) | |
| parent | 84a7e35eea97388ba5ca458808119650818c2fd2 (diff) | |
| download | git-2d23c64ba2e91029f4ce932117a1772378d63cf3.tar.gz git-2d23c64ba2e91029f4ce932117a1772378d63cf3.tar.xz | |
Merge branch 'jh/notes-add-ui'
* jh/notes-add-ui:
Make "git notes add" more user-friendly when there are existing notes
Conflicts:
builtin/notes.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-notes.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index 296f314ea..913ecd8c4 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/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. |