From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Wed, 10 Nov 2010 16:00:30 GMT
Subject: Re: [PATCH] git-rebase--interactive.sh: Add new command "shell"
Message-ID: <vpqtyjpw4m9.fsf@bauges.imag.fr>
In-Reply-To: <20101110084343.0c519764@chalon.bertin.fr>

Yann Dirson <dirson@bertin.fr> writes:

> BTW, about people feeling at ease with "rebase -i", I often feel not
> quite comfortable to explain why to reorder commits you have to use
> this "rebase" feature

I feel a bit the same. Actually, I don't think I ever used "rebase -i"
to actually perform a rebase. I usually "git pull --rebase" to rebase,
and "rebase -i" to rewrite history without changing the origin of the
branch.

> alias.reroll = rebase -i $(git merge-base HEAD @{upstream})

Mercurial calls this "histedit" for example.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/