diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:26:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:26:29 -0700 |
| commit | 060be00621dbac572ac71d07ae40884e0d4303f3 (patch) | |
| tree | e5d302b4ba8d1b8a9d526cc50c2e019c4f0daf36 /Documentation/merge-strategies.txt | |
| parent | Merge branch 'jn/am-doc-hooks' (diff) | |
| parent | sha1_file.c: document a bunch of functions defined in the file (diff) | |
| download | tgif-060be00621dbac572ac71d07ae40884e0d4303f3.tar.xz | |
Merge branch 'mh/object-code-cleanup'
* mh/object-code-cleanup:
sha1_file.c: document a bunch of functions defined in the file
sha1_file_name(): declare to return a const string
find_pack_entry(): document last_found_pack
replace_object: use struct members instead of an array
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions