Re: [PATCH v2] Give git-pull a --reset option

2019-04-22 Thread Phillip Wood
On 22/04/2019 00:38, Junio C Hamano wrote: "brian m. carlson" writes: It may be helpful to point out that this is essentially the workflow I had ... I'm not sure if this email is an argument for or against this option, but maybe it provides some helpful perspective. I think you and Philli

Re: [PATCH v2] Give git-pull a --reset option

2019-04-21 Thread Junio C Hamano
"brian m. carlson" writes: > It may be helpful to point out that this is essentially the workflow I > had ... > I'm not sure if this email is an argument for or against this option, > but maybe it provides some helpful perspective. I think you and Phillip misread me. I did not question if the w

Re: [PATCH v2] Give git-pull a --reset option

2019-04-21 Thread brian m. carlson
On Sun, Apr 21, 2019 at 02:38:38PM +0900, Junio C Hamano wrote: > Alex Henrie writes: > > > A common workflow is to make a commit on a local branch, push the branch > > to the remote, check out the remote branch on a second computer, amend > > the commit on the second computer, force-push back to

Re: [PATCH v2] Give git-pull a --reset option

2019-04-21 Thread Philip Oakley
Hi Alex On 21/04/2019 08:01, Alex Henrie wrote: On Sat, Apr 20, 2019 at 11:38 PM Junio C Hamano wrote: Alex Henrie writes: A common workflow is to make a commit on a local branch, push the branch to the remote, check out the remote branch on a second computer, amend the commit on the second

Re: [PATCH v2] Give git-pull a --reset option

2019-04-21 Thread Alex Henrie
On Sat, Apr 20, 2019 at 11:38 PM Junio C Hamano wrote: > > Alex Henrie writes: > > > A common workflow is to make a commit on a local branch, push the branch > > to the remote, check out the remote branch on a second computer, amend > > the commit on the second computer, force-push back to the re

Re: [PATCH v2] Give git-pull a --reset option

2019-04-20 Thread Junio C Hamano
Alex Henrie writes: > A common workflow is to make a commit on a local branch, push the branch > to the remote, check out the remote branch on a second computer, amend > the commit on the second computer, force-push back to the remote branch, > and finally submit a pull request. However, if the u

[PATCH v2] Give git-pull a --reset option

2019-04-20 Thread Alex Henrie
A common workflow is to make a commit on a local branch, push the branch to the remote, check out the remote branch on a second computer, amend the commit on the second computer, force-push back to the remote branch, and finally submit a pull request. However, if the user switches back to the first