Use --rebase with pull.

termie / git-bzr-ng

bi-directional git to bzr bridge: never fear bzr again

BSD 3-Clause "New" or "Revised" License

198 stars 47 forks source link

Use --rebase with pull. #21

Closed jd closed 13 years ago

jd commented 13 years ago

It seems to make sense, since we need to be a fast-forward when pushing.

termie commented 13 years ago

hmm, i suppose this is what we want, it sort of changes the semantics of 'pull' though, i need to think it over a bit... are there situations where we want the other behavior?

jd commented 13 years ago

I don't see any, but well, I'm a newcomer.

If you want something else you can still achieve it by doing a git bzr sync + git merge yourself.

But currently, if you just want to run an update to push just after, well, pulling will ask for a merge, and once you've done the merge, you can't push. You need to rebase. So… :-)