summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 16:04:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 16:04:36 -0700
commit2f18b4642d6ea052cb6ad85f3a013a33b6afbe92 (patch)
treebe5891465cb3be2f2a539c688625a08f8670a236 /t/t6037-merge-ours-theirs.sh
parentMerge branch 'jc/match-refs-clarify' (diff)
parentclear_ref_cache(): inline function (diff)
downloadtgif-2f18b4642d6ea052cb6ad85f3a013a33b6afbe92.tar.xz
Merge branch 'mh/ref-api'
* mh/ref-api: clear_ref_cache(): inline function write_ref_sha1(): only invalidate the loose ref cache clear_ref_cache(): extract two new functions clear_ref_cache(): rename parameter invalidate_ref_cache(): expose this function in the refs API invalidate_ref_cache(): take the submodule as parameter invalidate_ref_cache(): rename function from invalidate_cached_refs()
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions