From: Linus Torvalds Date: Thu, 25 Oct 2007 23:49:21 GMT Subject: Re: [PATCH] Teach 'git pull' the '--rebase' option Message-ID: In-Reply-To: On Thu, 25 Oct 2007, Linus Torvalds wrote: > Also, it's not strictly even necessary to publish things for this to cause > problems. It's perfectly sufficient to just do development on two private > developer machines, and do things like keeping the two machines in sync by > pulling things between them manually... .. or any branch use, for that matter. I do agree that "git merge --rebase" is potentially convenient, I'm just not sure it's a great idea to document as such. People shouldn't do it unless they really *really* understand the implications, and I think the implications are much easier to understand if you instead teach them "fetch+rebase", and perhaps even keep the "merge --rebase" option entirely undocumented. Linus