Re: [PATCH v8 06/16] sequencer: introduce the `merge` command

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

 



From: "Johannes Schindelin" <Johannes.Schindelin@xxxxxx> : Monday, April 23, 2018 1:03 PM
Subject: Re: [PATCH v8 06/16] sequencer: introduce the `merge` command


Hi Philip,

[...]

> label onto
>
> # Branch abc
> reset onto

Is this reset strictly necessary. We are already there @head.

No, this is not strictly necessary, but

I've realised my misunderstanding. I was thinking this (and others) was equivalent to

$  git reset <thatHead'onto'> # maybe even --hard,

i.e. affecting the worktree

rather that just being a movement of the Head rev (though I may be having brain fade here regarding untracked files etc..)


- it makes it easier to auto-generate (otherwise you would have to keep
 track of the "current HEAD" while generating that todo list, and

- if I keep the `reset onto` there, then it is *a lot* easier to reorder
 topic branches.

Ciao,
Dscho

Thanks

Philip



[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]

  Powered by Linux