summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-29 17:52:34 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-29 17:52:34 -0800
commit5eee142c89ee4964c9ea4ae1b2fa8344036a7efb (patch)
tree2d114ae692ac53034a4353e80f44e62598ed1d9a /merge-recursive.c
parentd7f4809bc5ceaef14420be57aecbdf8280fac81c (diff)
parentf6ce1f25885f3db71935b201c5e3c858eb993f5c (diff)
downloadgit-5eee142c89ee4964c9ea4ae1b2fa8344036a7efb.tar.gz
Merge branch 'jn/cherry-pick-refresh-index'
* jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions