projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 25b3d4d) | patch
"git-merge": allow fast-forwarding in a stat-dirty tree
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Aug 2008 22:09:28 +0000 (15:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Aug 2008 22:49:21 +0000 (15:49 -0700)
commit9ca8f6079cdb199851636c719900472a9745885f
tree0647b366e94f239e4485ee9ed6eafe8e9d63dd87tree | snapshot
parent25b3d4d6f39d70c4d46dee48570ae7aeeb4a6b58commit | diff
"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>
builtin-merge.c diff | blob | history
t/t7600-merge.sh diff | blob | history
Git—the stupid content tracker