Thus said Andy Goth on Wed, 12 Oct 2016 20:46:54 -0500:
> # Rebase breakfast to include side
> f up trunk # (Redundant in this case)
> f merge breakfast
> f commit -branch breakfast -m Rebase
This sounded familiar... I believe we have gone over this particular
merge style before:
Hi,
this is not a rebase, at least not in a sense of git. Git rebase is,
basically, what you would get if you recreate someone's work from diffs
published to a mail list. Rebase is an application of all commits, one by
one, from old branch to the new parent. After rebase you get a _new_ set
of
The full history is there. Nothing is destroyed. The goal is to re-baseline
the branch, which i accomplish by creating a new branch with the same name
which is merged from the original. Thus there is both one check-in
containing all past changes made on the branch, and also the branch from
which
Thus said Andy Goth on Wed, 12 Oct 2016 16:25:43 -0500:
> Comments? Questions? This method does everything my team needs.
> Perhaps Fossil might consider adopting it, or a streamlined variant,
> so we'll have an answer to the perennial question about how to do
> rebase.
I honestly
4 matches
Mail list logo