[Top][All Lists]

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

[Bug-zile] Rebasing Zi

From: Gary V. Vaughan
Subject: [Bug-zile] Rebasing Zi
Date: Wed, 15 Feb 2012 16:18:47 +0700

Now that a fair amount of the keycode rework I did in the Zi branch
has landed in the Lua branch, I've deleted the old long Zi branch (and
multiple merges from the Lua branch) from the savannah git repo, and
rebased just the differences over the HEAD of the lua branch.

So the new Zi branch is much cleaner and shorter, and picks up all
the fixes and improvements from the Lua branch without adding another
merge commit :)

I don't know how well git copes when you pull a rebased public branch
into a cloned repository containing the old branch, though I imagine
it will simply pull the new deltas, and move your origin/zi tag to
match.  From there, if necessary, you might want to delete your local
zi tag and apply it to the updated location.  On the other hand, git
might be smarter than I expect and handle everything gracefully by

Feel free to post your experiences here, since I plan to rewind and
rebase zi from time to time to pick up future change in its parent Lua
branch rather than accumulate a ton of messy merge commits all over
again... It would be nice to post a recipe for keeping your cloned repos
in sync if required.

Gary V. Vaughan (gary AT gnu DOT org)

reply via email to

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