Re: [PATCH 14/14] pull --rebase: error on no merge candidate cases

2015-05-22 Thread Stefan Beller
On Fri, May 22, 2015 at 7:14 AM, Johannes Schindelin wrote: > Hi Paul, > > On 2015-05-22 15:48, Paul Tan wrote: >> On Wed, May 20, 2015 at 12:27 AM, Junio C Hamano wrote: >>> Johannes Schindelin writes: >>> >> - fprintf(stderr, >> - _("There are no can

Re: [PATCH 14/14] pull --rebase: error on no merge candidate cases

2015-05-22 Thread Johannes Schindelin
Hi Paul, On 2015-05-22 15:48, Paul Tan wrote: > On Wed, May 20, 2015 at 12:27 AM, Junio C Hamano wrote: >> Johannes Schindelin writes: >> > - fprintf(stderr, > - _("There are no candidates for merging among the > refs that you just fetched.\n" >>>

Re: [PATCH 14/14] pull --rebase: error on no merge candidate cases

2015-05-22 Thread Paul Tan
On Wed, May 20, 2015 at 12:27 AM, Junio C Hamano wrote: > Johannes Schindelin writes: > - fprintf(stderr, - _("There are no candidates for merging among the refs that you just fetched.\n" - "Generally this means that y