List Archive: gentoo-scm
Note: Due to technical difficulties, the Archives are currently not up to date.
provides an alternative service for most mailing lists.c.f. bug 424647
On 05:03 Tue 14 Apr , Caleb Cushing wrote:
> On Tue, Apr 14, 2009 at 4:57 AM, Robin H. Johnson <firstname.lastname@example.org> wrote:
> > Anybody wanting to pull and getting a failure due to non-fast-forwarding needs
> > to force it:
> don't pull, pull merges... rebase.
For those of you less familiar with git, this is relevant when you've
made local commits that haven't been pushed yet. If you pull with no
options, you get these dumb merge entries in the history, but if you do
pull --rebase, it rebases your local commits onto HEAD without putting
the merge into history.
Developer, Gentoo Linux