]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mh/replace-refs-variable-rename'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:27:06 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Mar 2014 21:27:06 +0000 (14:27 -0700)
* mh/replace-refs-variable-rename:
  Document some functions defined in object.c
  Add docstrings for lookup_replace_object() and do_lookup_replace_object()
  rename read_replace_refs to check_replace_refs

1  2 
builtin/fsck.c
builtin/pack-objects.c
builtin/prune.c
builtin/replace.c
builtin/unpack-objects.c
cache.h
replace_object.c

diff --cc builtin/fsck.c
Simple merge
Simple merge
diff --cc builtin/prune.c
Simple merge
Simple merge
Simple merge
diff --cc cache.h
Simple merge
Simple merge