Re: [GSoC][PATCH v4 0/4] [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits

2019-06-17 Thread Thomas Gummerer
On 06/16, Rohit Ashiwal wrote: > Yet another iteration of my patch. We have changed the series a little bit. We > now have a commit that rename `reset_for_rollback` to `reset_merge`. A lot of > nit-picks were handled in this revision. Thanks for your work! I allowed myself to nitpick a bit more a

[GSoC][PATCH v4 0/4] [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits

2019-06-16 Thread Rohit Ashiwal
Yet another iteration of my patch. We have changed the series a little bit. We now have a commit that rename `reset_for_rollback` to `reset_merge`. A lot of nit-picks were handled in this revision. Thanks Rohit Rohit Ashiwal (4): sequencer: add advice for revert sequencer: rename reset_for_ro

Re: [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits

2019-06-09 Thread Thomas Gummerer
On 06/09, Rohit Ashiwal wrote: > > > PR: https://github.com/r1walz/git/pull/1 > > > Reviewed-by: Elijah Newren > > > Reviewed-by: Thomas Gummerer > > > > Note that the 'Reviewed-by' footer is something that is "given" by the > > reviewers, and should only be added after they have explicitly given

Re: [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits

2019-06-09 Thread Rohit Ashiwal
Hey Thomas On Sun, Jun 9, 2019 at 2:32 PM Thomas Gummerer wrote: > > Thanks! I found a few minor nits that I missed in my off-list review > on the PR. We should give others some time to comment now before you > re-send it with the nits fixed (if you agree with them). Yes, I'll wait for some mo

Re: [GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits

2019-06-09 Thread Thomas Gummerer
On 06/09, Rohit Ashiwal wrote: > git am or rebase advice user to use git am --skip or git rebase --skip > to skip the commit that has become empty or has risen conflicts. OTOH, > cherry-pick advice user to use git reset HEAD which on the user’s part > is annoying and sometimes confusing. This patch

[GSoC][PATCH 0/3] Teach cherry-pick/revert to skip commits

2019-06-08 Thread Rohit Ashiwal
git am or rebase advice user to use git am --skip or git rebase --skip to skip the commit that has become empty or has risen conflicts. OTOH, cherry-pick advice user to use git reset HEAD which on the user’s part is annoying and sometimes confusing. This patch series will bring consistency between