summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 14:37:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 14:37:25 -0800
commit56eb8b43ebdb38683ff5ce395d7b5e080d402b5b (patch)
tree759ed075b90f29999e504654e3d92a470e9ab3c0 /Documentation/git-merge-index.txt
parentSync with 1.6.6.1 (diff)
parentdate.c: mark file-local function static (diff)
downloadtgif-56eb8b43ebdb38683ff5ce395d7b5e080d402b5b.tar.xz
Merge branch 'jc/symbol-static'
* 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
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions