diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-18 23:37:46 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-18 23:37:46 +0200 |
commit | 06e211acc61c52a2e1709ea8b62a0b0f6dcb492b (patch) | |
tree | f69ccce2499e864ed3c0a6c71c7aec4b5d3a61f6 /diff.c | |
parent | Merge branch 'pw/p4-submit-conflicts' (diff) | |
parent | sequencer.c: mark a private file-scope symbol as static (diff) | |
download | git-06e211acc61c52a2e1709ea8b62a0b0f6dcb492b.tar.xz git-06e211acc61c52a2e1709ea8b62a0b0f6dcb492b.zip |
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 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -25,7 +25,7 @@ static int diff_detect_rename_default; static int diff_rename_limit_default = 400; static int diff_suppress_blank_empty; -int diff_use_color_default = -1; +static int diff_use_color_default = -1; static const char *diff_word_regex_cfg; static const char *external_diff_cmd_cfg; int diff_auto_refresh_index = 1; |