diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-20 22:09:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-20 22:49:21 (GMT) |
| commit | 9ca8f6079cdb199851636c719900472a9745885f (patch) | |
| tree | 0647b366e94f239e4485ee9ed6eafe8e9d63dd87 /templates/Makefile | |
| parent | 25b3d4d6f39d70c4d46dee48570ae7aeeb4a6b58 (diff) | |
| download | git-9ca8f6079cdb199851636c719900472a9745885f.zip git-9ca8f6079cdb199851636c719900472a9745885f.tar.gz git-9ca8f6079cdb199851636c719900472a9745885f.tar.bz2 | |
"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/Makefile')
0 files changed, 0 insertions, 0 deletions