BTW, I made a mistake earlier -- the relevant section is "concurrent
development".
On May 10, Jay McCarthy wrote:
> On Mon, May 10, 2010 at 6:14 PM, Eli Barzilay <e...@barzilay.org> wrote:
> > You can do it with a single `git pull --rebase' (also mentioned).
>
> I don't understand. If I can always use this command, why isn't that
> the default?
I explain that too in the text. Look for "This also explains why `git
pull' does not rebase by default."
See also the part about aliases, where I show a sample alias of:
# satisfy the "up instinct"
up = pull --ff-only --stat --all
and you can change that `--ff-only' to `--rebase'.
(The `--ff-only' is also explained in the text.)
--
((lambda (x) (x x)) (lambda (x) (x x))) Eli Barzilay:
http://barzilay.org/ Maze is Life!
_________________________________________________
For list-related administrative tasks:
http://list.cs.brown.edu/mailman/listinfo/plt-dev
