summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-20 15:09:28 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-20 15:49:21 -0700
commit9ca8f6079cdb199851636c719900472a9745885f (patch)
tree0647b366e94f239e4485ee9ed6eafe8e9d63dd87 /templates
parent25b3d4d6f39d70c4d46dee48570ae7aeeb4a6b58 (diff)
downloadgit-9ca8f6079cdb199851636c719900472a9745885f.tar.gz
"git-merge": allow fast-forwarding in a stat-dirty tree
We used to refresh the index to clear stat-dirtyness before a fast-forward merge. Recent C rewrite forgot to do this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions