Re: Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-04 Thread John Keeping
On Tue, Mar 03, 2015 at 03:54:05PM -0800, Mike Botsko wrote: > Thanks, that clarifies a lot. > > I only have two follow-up questions: > > In your branch example, how does git determine that C/D have been > rewritten and need to be "replaced" with their current versions > existing upstream? In thi

Re: Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-03 Thread Mike Botsko
Thanks, that clarifies a lot. I only have two follow-up questions: In your branch example, how does git determine that C/D have been rewritten and need to be "replaced" with their current versions existing upstream? In this scenario I've encountered, the commit hash and the patch ID of those comm

Re: Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-03 Thread John Keeping
On Tue, Mar 03, 2015 at 03:20:48PM -0800, Mike Botsko wrote: > Maybe I'm lacking the distinction regarding what I'm being specific about. > > In both examples, I'm asking it specifically to rebase in changes from > the remote "upstream" and a named branch at that location. I'm giving > git the sam

Re: Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-03 Thread Mike Botsko
Maybe I'm lacking the distinction regarding what I'm being specific about. In both examples, I'm asking it specifically to rebase in changes from the remote "upstream" and a named branch at that location. I'm giving git the same information, it's just interpreting it differently - and I'm not unde

Re: Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-03 Thread Junio C Hamano
John Keeping writes: > git-rebase assumes that if you give an explicit upstream then you want > precisely what you asked for. From git-rebase(1): > > If either or --root is given on the command line, > then the default is `--no-fork-point`, otherwise the default is > `--fork-p

Re: Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-03 Thread John Keeping
On Tue, Mar 03, 2015 at 01:31:39PM -0800, Mike Botsko wrote: > I'm using git 2.2.1 on Mac OS X Yosemite. > > I just tried the git rebase with "--fork-point" added, and it works properly: > > $ git rebase upstream/our-branch-name --fork-point > First, rewinding head to replay your work on top of i

Re: Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-03 Thread Mike Botsko
I'm using git 2.2.1 on Mac OS X Yosemite. I just tried the git rebase with "--fork-point" added, and it works properly: $ git rebase upstream/our-branch-name --fork-point First, rewinding head to replay your work on top of it... Applying: B-07241 While discussing with someone else, he mentioned

Re: Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-03 Thread John Keeping
On Tue, Mar 03, 2015 at 12:39:31PM -0800, Mike Botsko wrote: > I'm seeing unexpected behavior between "git pull --rebase" and "git > rebase" commands, which are supposed to be (and always described as) > synonymous: > > git pull --rebase upstream our-branch-name > > and > > git fetch upstream >

Unexpected/unexplained difference between git pull --rebase and git rebase

2015-03-03 Thread Mike Botsko
Hello, I'm seeing unexpected behavior between "git pull --rebase" and "git rebase" commands, which are supposed to be (and always described as) synonymous: git pull --rebase upstream our-branch-name and git fetch upstream git rebase upstream/our-branch-name We have a situation where the upstre