On Wed, May 11, 2011 at 10:22 AM, Anders Gidenstam wrote:
> Each rebase moves your local commits to be on-top of all upstream commits.
>
> This is the effect of the rebase. If I had merged my branch with the
> upstream branch instead of rebasing it on top of the upstream branch my
> commits would have been somwhere way down in the history.
>
> However, note that each rebase creates new commits since the commit ID is
> a consequence of the history preceding the commit. The old "copies" of my
> commits from previous rebases are no longer part of my local branch.
Is it possible to rebase later after you've done a merge to put your changes
back on top?
Thanks,
Curt.
--
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
