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/git-merge.txt | |
| parent | Merge branch 'nd/maint-setup' (diff) | |
| parent | Make "git notes add" more user-friendly when there are existing notes (diff) | |
| download | tgif-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/git-merge.txt')
0 files changed, 0 insertions, 0 deletions