summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 22:05:05 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 22:05:05 -0700
commit497c32136f80aca5f724bf70c2a0f44b63cb79f1 (patch)
treea76bc259f298ea56fa63763921aca8f3d9d0015c /Documentation/git-merge-index.txt
parentMerge branch 'master' into jc/cache-tree (diff)
downloadtgif-497c32136f80aca5f724bf70c2a0f44b63cb79f1.tar.xz
update-index: when --unresolve, smudge the relevant cache-tree entries.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions