Hi Rohit
On 10/06/2019 14:43, Rohit Ashiwal wrote:
> Hi Phillip
>
> On 2019-06-10 10:40 UTC Phillip Wood wrote:
>>
>> [...]
>> It's actually a bit more complicated as if the cherry-pick failed
>> because it would have overwriten untracked files then CHERRY_PICK_HEAD
>> will not exist but we want
Hi Phillip
On 2019-06-10 10:40 UTC Phillip Wood wrote:
>
> [...]
> It's actually a bit more complicated as if the cherry-pick failed
> because it would have overwriten untracked files then CHERRY_PICK_HEAD
> will not exist but we want to be able to skip that pick. So it should
> not error out in
Hi Rohit
On 10/06/2019 06:57, Rohit Ashiwal wrote:
> Hey Phillip
>
> On Sun, 9 Jun 2019 19:01:35 +0100 Phillip Wood
> wrote:
>>
>> Hi Rohit
>>
>> --skip is definitely a useful addition to cherry-pick/revert
>>
>> On 08/06/2019 20:19, Rohit Ashiwal wrote:
>>>
>>> [...]
>>> @@ -2784,6 +2784,29 @@
Hey Phillip
On Sun, 9 Jun 2019 19:01:35 +0100 Phillip Wood
wrote:
>
> Hi Rohit
>
> --skip is definitely a useful addition to cherry-pick/revert
>
> On 08/06/2019 20:19, Rohit Ashiwal wrote:
> >
> > [...]
> > @@ -2784,6 +2784,29 @@ int sequencer_rollback(struct repository *r, struct
> > replay
Hi Rohit
--skip is definitely a useful addition to cherry-pick/revert
On 08/06/2019 20:19, Rohit Ashiwal wrote:
> git am or rebase advise the user to use `git (am | rebase) --skip` to
> skip the commit. cherry-pick and revert also have this concept of
> skipping commits but they advise the user t
On 06/09, Rohit Ashiwal wrote:
> git am or rebase advise the user to use `git (am | rebase) --skip` to
> skip the commit. cherry-pick and revert also have this concept of
> skipping commits but they advise the user to use `git reset` (or in
> case of a patch which had conflicts, `git reset --merge`
6 matches
Mail list logo
