| commit | da53eec68873e76c68086e405f3f1329d47055b3 | |
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
| Fri, 22 Oct 2010 06:49:45 +0000 (22 01:49 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Oct 2010 18:04:53 +0000 (22 11:04 -0700) | ||
| tree | 750c54e71333132ec43e222f0bd202ee7b855b61 | treesnapshot (tar.gz zip) |
| parent | cbb3167ef8b73109ed5c5e54aa1915d9c50f83d5 | commitdiff |
merge -h: show usage even with corrupt index
Part of a campaign to make sure "git <command> -h" works correctly
when run from distractingly bad repositories.
[jn: with rewritten log message and tests]
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Part of a campaign to make sure "git <command> -h" works correctly
when run from distractingly bad repositories.
[jn: with rewritten log message and tests]
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory | |
| t/t7600-merge.sh | diffblobblamehistory |