| commit | 9ca8f6079cdb199851636c719900472a9745885f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Aug 2008 22:09:28 +0000 (20 15:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Aug 2008 22:49:21 +0000 (20 15:49 -0700) | ||
| tree | 0647b366e94f239e4485ee9ed6eafe8e9d63dd87 | treesnapshot (tar.gz zip) |
| parent | 25b3d4d6f39d70c4d46dee48570ae7aeeb4a6b58 | commitdiff |
"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>
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 | diffblobblamehistory | |
| t/t7600-merge.sh | diffblobblamehistory |