Hi,
If you would like to avoid merge commit, use "git pull --rebase" in place
of plain "git pull".
HTH
Julien
git config --global branch.autosetuprebase always
is meant to act as a safety net
On Wed, Apr 10, 2013 at 7:06 AM, Julien Vermillard
wrote:
> Hi,
> If you would like to avoid merge commit, use "git pull --rebase" in place
> of plain "git pull".
>
> HTH
> Julien
Le 4/10/13 4:04 PM, Andrew Cagney a écrit :
> git config --global branch.autosetuprebase always
>
> is meant to act as a safety net
I start to regret the migration to git ;-)
--
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com
Funny,
as I generally pull specific branchs only,
git pull --rebase works
git pull --rebase origin trunk:trunk is KO
Jeff
On Wed, Apr 10, 2013 at 4:59 PM, Emmanuel Lécharny wrote:
> Le 4/10/13 4:04 PM, Andrew Cagney a écrit :
> > git config --global branch.autosetuprebase always
> >
> > is