summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-21 04:28:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-21 04:28:50 (GMT)
commite98f80f50bf9b78aab8cea6184fd708259d0c3b3 (patch)
tree71457289ee60e6a80b14ab867c987b16f637eb3b /merge-recursive.h
parentadd0951ab0bee43b5f634d1be68a7a80f627c18f (diff)
parent4e1a7baa2e466afded9ff50b9a4539b24dbd3584 (diff)
downloadgit-e98f80f50bf9b78aab8cea6184fd708259d0c3b3.zip
git-e98f80f50bf9b78aab8cea6184fd708259d0c3b3.tar.gz
git-e98f80f50bf9b78aab8cea6184fd708259d0c3b3.tar.bz2
Merge branch 'nd/status-partial-refresh'
* nd/status-partial-refresh: rm: only refresh entries that we may touch status: only touch path we may need to check
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions