Hal Murray <[email protected]>:
> Thanks. I hate that crap as much as anybody.
>
> > git pull --rebase
>
> I missed the --rebase part.
>
> Is there any way to set things up so --rebase is the default with pull?
Yes. If you look in your .git/config, adding the "rebase = true" line will
set --rebase for all pulls from master.
[branch "master"]
remote = origin
merge = refs/heads/master
rebase = true
> Is there any way to recover after I forget?
Not short of repository surgery. Remember the hash chain - git is actually
designed to make it difficult to modify old commits.
> Can we fix the push process to reject pushes if they have that type of
> comment?
Theoretically possible, but probably a bad idea. We will probably have to
do real branch merges occasionally.
--
<a href="http://www.catb.org/~esr/";>Eric S. Raymond</a>
_______________________________________________
devel mailing list
[email protected]
http://lists.ntpsec.org/mailman/listinfo/devel
