On 19 jun 2008, at 21:14, Junio C Hamano wrote:
Hm, --rebasing sounds weird to me as well. Maybe --track=merge and
--track=rebase, with --track being equal to --track=merge?
That looks like the best wording so far, although I suspect that the
true
reason why all of the above sounds confusing may be because the
concept
itself is not clear.
That's why I suggested --auto-rebase, which is more verbose in what
it does. Perhaps we should add it as an optional flag for --track, like
git branch --track --auto-rebase local remote/branch
? That is a bit long though.
I don't think "--track=rebase" makes a lot of sense, since "track" is
still a boolean in my head ;)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html