| commit | 5c21ac0e7c475c82039ab604ee9d7d8430889346 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 22 Apr 2006 10:58:04 +0000 (22 03:58 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 22 Apr 2006 11:03:32 +0000 (22 04:03 -0700) | ||
| tree | 4dc25e01b3d8b9bf4eb46bab7c9632afd84c29fa | treesnapshot (tar.gz zip) |
| parent | e09ad6e1e3308fde346b4b6287d9441363806832 | commitdiff |
Libified diff-index: backward compatibility fix.
"diff-index -m" does not mean "do not ignore merges", but means
"pretend missing files match the index".
The previous round tried to address this, but failed because
setup_revisions() ate "-m" flag before the caller had a chance
to intervene.
Signed-off-by: Junio C Hamano <junkio@cox.net>
"diff-index -m" does not mean "do not ignore merges", but means
"pretend missing files match the index".
The previous round tried to address this, but failed because
setup_revisions() ate "-m" flag before the caller had a chance
to intervene.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| diff-index.c | diffblobblamehistory | |
| diff-lib.c | diffblobblamehistory | |
| diff.h | diffblobblamehistory |