diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:39:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:39:16 -0700 |
| commit | 1b9fa0e81134df5c067efc1e3413f05c9e5043f8 (patch) | |
| tree | 7a55681b9fa624afb3768e363412d49b8871fd23 /merge-recursive.h | |
| parent | Merge branch 'ab/test-cleanup' into maint (diff) | |
| parent | Documentation/notes: nitpicks (diff) | |
| download | tgif-1b9fa0e81134df5c067efc1e3413f05c9e5043f8.tar.xz | |
Merge branch 'jn/notes-doc' into maint
* jn/notes-doc:
Documentation/notes: nitpicks
Documentation/notes: clean up description of rewriting configuration
Documentation/notes: simplify treatment of default display refs
Documentation/log: add a CONFIGURATION section
Documentation/notes: simplify treatment of default notes ref
Documentation/notes: add configuration section
Documentation/notes: describe content of notes blobs
Documentation/notes: document format of notes trees
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions