Merge branch 'jc/symbol-static'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:37:25 +0000 (14:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:37:25 +0000 (14:37 -0800)
* jc/symbol-static:
  date.c: mark file-local function static
  Replace parse_blob() with an explanatory comment
  symlinks.c: remove unused functions
  object.c: remove unused functions
  strbuf.c: remove unused function
  sha1_file.c: remove unused function
  mailmap.c: remove unused function
  utf8.c: mark file-local function static
  submodule.c: mark file-local function static
  quote.c: mark file-local function static
  remote-curl.c: mark file-local function static
  read-cache.c: mark file-local functions static
  parse-options.c: mark file-local function static
  entry.c: mark file-local function static
  http.c: mark file-local functions static
  pretty.c: mark file-local function static
  builtin-rev-list.c: mark file-local function static
  bisect.c: mark file-local function static

1  2 
bisect.c
cache.h
entry.c
git-compat-util.h
parse-options.c
parse-options.h
read-cache.c
remote-curl.c

diff --cc bisect.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc entry.c
Simple merge
Simple merge
diff --cc parse-options.c
Simple merge
diff --cc parse-options.h
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc remote-curl.c
Simple merge