| commit | 0d8135891eb81d06d818a53c479ea3798df96e3a | |
| author | David Symonds <dsymonds@gmail.com> | |
| Fri, 23 Nov 2007 13:38:50 +0000 (24 00:38 +1100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Nov 2007 22:15:08 +0000 (30 14:15 -0800) | ||
| tree | 6dbf77e17664593b28544868550c6f8771046f97 | treesnapshot (tar.gz zip) |
| parent | 804c7174c9d7c81b5215bcd9002f3bd600ecb6e4 | commitdiff |
Mention that git-rm can be an appropriate resolution as well as git-add.
Especially when using git-cherry-pick, removing files that are unmerged can be
a logical action. This patch merely changes the informative text to be less
confusing.
Signed-off-by: David Symonds <dsymonds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Especially when using git-cherry-pick, removing files that are unmerged can be
a logical action. This patch merely changes the informative text to be less
confusing.
Signed-off-by: David Symonds <dsymonds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-revert.c | diffblobblamehistory |