Git pull with rebase would be a really handy thing to have. When working on a large project with multiple developers, it is very useful for helping everybody ensure they are working against the master branch.
See also similar bug reports 188685 and 206418 for Mercurial.
I volunteer for this as well. Could we just start from merge? I guess we then will some simple actions for handling rebase conflicts: continue/abort/skip rebase...
(In reply to comment #1)
> I volunteer for this as well. Could we just start from merge? I guess we then
> will some simple actions for handling rebase conflicts: continue/abort/skip
Sorry, forget about this comment, one, it was intended for #221661
+1 to this. Would drastically improve the usefulness of NetBeans with Git.
Integrated into 'main-golden', will be available in build *201303192300* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)
User: Ondrej Vrabec <firstname.lastname@example.org>
Log: #213855 - git pull --rebase
when pull requires a merge commit, offering the option do the merge or rebase
Verified in 201307312300