diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:37:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:37:46 -0700 |
| commit | 06e211acc61c52a2e1709ea8b62a0b0f6dcb492b (patch) | |
| tree | f69ccce2499e864ed3c0a6c71c7aec4b5d3a61f6 /rerere.h | |
| parent | Merge branch 'pw/p4-submit-conflicts' (diff) | |
| parent | sequencer.c: mark a private file-scope symbol as static (diff) | |
| download | tgif-06e211acc61c52a2e1709ea8b62a0b0f6dcb492b.tar.xz | |
Merge branch 'jc/make-static'
Turn many file-scope private symbols to static to reduce the
global namespace contamination.
* jc/make-static:
sequencer.c: mark a private file-scope symbol as static
ident.c: mark private file-scope symbols as static
trace.c: mark a private file-scope symbol as static
wt-status.c: mark a private file-scope symbol as static
read-cache.c: mark a private file-scope symbol as static
strbuf.c: mark a private file-scope symbol as static
sha1-array.c: mark a private file-scope symbol as static
symlinks.c: mark private file-scope symbols as static
notes.c: mark a private file-scope symbol as static
rerere.c: mark private file-scope symbols as static
graph.c: mark private file-scope symbols as static
diff.c: mark a private file-scope symbol as static
commit.c: mark a file-scope private symbol as static
builtin/notes.c: mark file-scope private symbols as static
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -16,7 +16,6 @@ extern void *RERERE_RESOLVED; extern int setup_rerere(struct string_list *, int); extern int rerere(int); extern const char *rerere_path(const char *hex, const char *file); -extern int has_rerere_resolution(const char *hex); extern int rerere_forget(const char **); extern int rerere_remaining(struct string_list *); extern void rerere_clear(struct string_list *); |