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

2013-06-18 Thread Ramkumar Ramachandra
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

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

2013-06-18 Thread Matthieu Moy
Ramkumar Ramachandra artag...@gmail.com writes: 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

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

2013-06-18 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Ramkumar Ramachandra artag...@gmail.com writes: 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