| commit | b1440cc8060e79f885691ebeae7ce033bd606a7c | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 24 Feb 2007 09:05:27 +0000 (24 01:05 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 24 Feb 2007 09:06:19 +0000 (24 01:06 -0800) | ||
| tree | 3814718e45ebb948d423e24c41ca71fd565be12a | treesnapshot (tar.gz zip) |
| parent | c06d2daa12f72f175e3569bbb2a5f25e5f134f5e | commitdiff |
Reword git-am 3-way fallback failure message.
When the blobs recorded on the index lines in the patch as pre-image
blobs are not found in the repository, "git-am" punted saying
that the index line does not record anything useful. This was not
clear enough -- the index line does have something useful but the
problem was that it was not useful in _that_ repository.
Reword the message as Francis Moreau suggests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When the blobs recorded on the index lines in the patch as pre-image
blobs are not found in the repository, "git-am" punted saying
that the index line does not record anything useful. This was not
clear enough -- the index line does have something useful but the
problem was that it was not useful in _that_ repository.
Reword the message as Francis Moreau suggests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-am.sh | diffblobblamehistory |