[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Issue 2100: Explanation of branches for CG (issue 5539062)

From: dak
Subject: Re: Issue 2100: Explanation of branches for CG (issue 5539062)
Date: Sun, 15 Jan 2012 12:50:21 +0000

On 2012/01/15 12:43:03, Carl wrote:
On 2012/01/15 12:32:21, Graham Percival wrote:
> On Sun, Jan 15, 2012 at 12:18:57PM +0000,
> >
> > I think you misunderstand what git rebase does.  git rebase
> > origin/staging does *not* bring origin/staging into dev/cg;
> really?  wow, I completely misunderstood that.

Yes.  git rebase just changes the *attachment point* of the branch.
So although
the source code in the current directory will change with git rebase,
the branch
itself won't.

Carl, you are wrong.  You can, at your choice, read the manual page of
git rebase, or do a few experiments on local branches.

git rebase most certainly brings the commits of the specified branch
into the checked-out branch, and puts the non-common commits in the
checked-out branch on top.  There is no way that the commits will get
out again by a pure rebase (without --onto option), so if the commits
get removed from origin/staging for some manner, they most certainly
will stay in dev/cg if that has been rebased on the old origin/staging.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]