Junio C Hamano <gits...@pobox.com> writes: > David Kastrup <d...@gnu.org> writes: > >> All that verbosity... >> >> $ git stash pop >> Auto-merging foo.txt >> CONFLICT (content): Merge conflict in foo.txt >> Cowardly refusing to drop stash >> $ > > Actually, modulo "Cowardly", that may be the most harmless phrasing, > as apply_stash may try to signal an error for reasons not related to > an inability to apply the change cleanly (e.g. we may have failed to > refresh the index).
Without "Cowardly", the capriciosity of "refusing" does not make much sense. The error message is a tribute to GNU tar: dak@lola:/tmp$ mkdir x dak@lola:/tmp$ tar cfz x tar: Cowardly refusing to create an empty archive Try `tar --help' or `tar --usage' for more information. dak@lola:/tmp$ The boring variant would be $ git stash pop Auto-merging foo.txt CONFLICT (content): Merge conflict in foo.txt Not dropping stash $ -- David Kastrup -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
