Hi,
Robert Dailey wrote:
> Not sure if this is intended or a bug, but with the following configuration:
>
> $ git config --global merge.ff false
>
> I am not able to merge my topic branch into master with squash option:
>
> $ git checkout master
> $ git merge --squash topic
> fatal: You cannot
On Fri, Jan 5, 2018 at 2:54 PM, Bryan Turner wrote:
> The two _aren't_ distinctly separate, though. "git merge --squash
> --ff-only" has very different semantics to "git merge --squash --ff",
> in that it will only create a new squashed commit (or fast-forward a
> single
On Fri, 2018-01-05 at 12:12 -0800, Bryan Turner wrote:
> On Fri, Jan 5, 2018 at 11:59 AM, Robert Dailey
> wrote:
> > Not sure if this is intended or a bug, but with the following
> > configuration:
> >
> > $ git config --global merge.ff false
> >
> > I am not able to
On Fri, Jan 5, 2018 at 12:35 PM, Robert Dailey wrote:
> On Fri, Jan 5, 2018 at 2:26 PM, Paul Smith wrote:
>> On Fri, 2018-01-05 at 12:12 -0800, Bryan Turner wrote:
>>> On Fri, Jan 5, 2018 at 11:59 AM, Robert Dailey
>>>
On Fri, Jan 5, 2018 at 2:26 PM, Paul Smith wrote:
> On Fri, 2018-01-05 at 12:12 -0800, Bryan Turner wrote:
>> On Fri, Jan 5, 2018 at 11:59 AM, Robert Dailey
>> wrote:
>> > Not sure if this is intended or a bug, but with the following
>> >
On Fri, Jan 5, 2018 at 11:59 AM, Robert Dailey wrote:
> Not sure if this is intended or a bug, but with the following configuration:
>
> $ git config --global merge.ff false
>
> I am not able to merge my topic branch into master with squash option:
>
> $ git checkout
Not sure if this is intended or a bug, but with the following configuration:
$ git config --global merge.ff false
I am not able to merge my topic branch into master with squash option:
$ git checkout master
$ git merge --squash topic
fatal: You cannot combine --squash with --no-ff.
I'm not
7 matches
Mail list logo