[Plone-conference] A tip about working with git at sprints
Nejc Zupan
nejc.zupan at gmail.com
Sun Oct 14 14:36:28 UTC 2012
On 14/10/2012, at 10:50, Andreas Zeidler wrote:
> On 14 Oct 2012, at 01:40, Maurits van Rees <m.van.rees at zestsoftware.nl> wrote:
>> Op 14-10-12 01:29, David Glick schreef:
>>> Instead of doing "git pull," you can do "git pull --rebase". This will make git redo your commit(s) after the one(s) that happened on github, so that no additional merge commit is necessary unless something conflicts.
>>
>> Ah, I have not used that one yet. Should work nicely, thanks. I usually do interactive rebases.
>>
>> In case you have already done a normal git pull and you have ended up in the situation David mentions, you can also do `git rebase -i HEAD^^` to interactively rebase the last two commits (or more, if you add more carets).
>
> you don't even have to remember this — a simple `git rebase` (without any further arguments) will rebase your changes neatly, even after having "pulled" already.
This didn't work for me until I upgraded to a more recent version of git.
z.
More information about the Plone-conference
mailing list