Re: [PATCH] Documentation/git-merge.txt: weaken warning about uncommited changes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Matthieu Moy wrote:
> Weaken the warning by discouraging only merge with /non-trivial/
> uncommited changes.
>
> I don't think documenting all the failure cases in the doc would be a
> good idea, so I've left the "in some cases" part.

It's already documented in the pre-merge checks section, as Jonathan
pointed out [1].  We should update the documentation to point to it: I
do not think "non-trivial" is much of an improvement.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/221069/focus=221366
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]