Andrew Wong:
Instead of rebasing to HEAD~, you should be able to do:
git rebase -i HEAD
Would you look at that, that actually works. So much for not testing
that. Thanks, that makes it a lot easier.
Instead of appending your own recipe, you could also abuse the EDITOR
environment
On 09/13/2012 09:33 AM, Peter Krefting wrote:
But this could potentially be dangerous because if rebase fires up
a editor for any other reason (e.g. having a reword or squash in
your recipe), then the commit message will be messed up. So you need
to make sure your recipe won't trigger any
On 09/11/2012 02:32 AM, Peter Krefting wrote:
Now, to my question. Is there an easy way to run interactive rebase on
the upstream branch with this recipe? The best we have come up with so
far is
git checkout master # the upstream branch
git rebase -i HEAD~
and then just append everything
Hi!
At $DAYJOB, we have a lot of code flowing from a central repository
to repositories which hold refinitions and ports of the code from the
central repository. Often enough the people working on the porting
repositories find bugs in the code from the central repository, and
want to submit
Peter Krefting pe...@softwolves.pp.se writes:
I was thinking about using git cherry-pick with a list of commits,
rebase is better at helping with conflicts and such.
Because the three-way merge done by rebase is exactly the same as
cherry-pick, I do not think I understand the reasoning behind
5 matches
Mail list logo
