Re: odd configure error

[John Mandereau]

Graham Percival a écrit :
> On Sat, Mar 28, 2009 at 11:57:06AM +0100, Reinhold Kainhofer wrote:
>   
> > - -) git fetch + git rebase will take that local commit and append it 
> > after
> >   the HEAD of current master, so it will be
> >    yourcommit (=new local master)
> >           |
> >    current_remote_head
> >           |
> >     state when you last pulled/fetched
> >     
> The first version looks easier to read.  Is there any command-line
> argument we could give to "git commit" to make it automatically
> rebase stuff?  Or any option we could give to "git pull", or an
> option to set in git/config ?
>   

git pull --rebase

Note that as soon as you start comitting local changes, you should read 
how to solve conflicts; IIRC Trevor, Reinhold and I already pointed out 
you can't escape this point.

Cheers,
John