Re: [PATCH v2] rebase: teach rebase --keep-base

2019-04-01 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Denton, > > On Thu, 28 Mar 2019, Denton Liu wrote: > >> A common scenario is if a user is working on a topic branch and they >> wish to make some changes to intermediate commits or autosquash, they >> would run something such as >> >> git rebase -i --onto mas

Re: [PATCH v2] rebase: teach rebase --keep-base

2019-03-29 Thread Denton Liu
Hi Johannes, On Fri, Mar 29, 2019 at 04:47:42PM +0100, Johannes Schindelin wrote: > Hi Denton, > > On Thu, 28 Mar 2019, Denton Liu wrote: > > > A common scenario is if a user is working on a topic branch and they > > wish to make some changes to intermediate commits or autosquash, they > > would

Re: [PATCH v2] rebase: teach rebase --keep-base

2019-03-29 Thread Johannes Schindelin
Hi Denton, On Thu, 28 Mar 2019, Denton Liu wrote: > A common scenario is if a user is working on a topic branch and they > wish to make some changes to intermediate commits or autosquash, they > would run something such as > > git rebase -i --onto master... master > > in order to preserve t

Re: [PATCH v2] rebase: teach rebase --keep-base

2019-03-28 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 28 2019, Denton Liu wrote: > A common scenario is if a user is working on a topic branch and they > wish to make some changes to intermediate commits or autosquash, they > would run something such as > > git rebase -i --onto master... master > > in order to preserve the merge b

[PATCH v2] rebase: teach rebase --keep-base

2019-03-28 Thread Denton Liu
A common scenario is if a user is working on a topic branch and they wish to make some changes to intermediate commits or autosquash, they would run something such as git rebase -i --onto master... master in order to preserve the merge base. This prevents unnecessary commit churning. Alt