Avoiding merge bubbles
hmurray at megapathdsl.net
Sat Jul 2 23:54:06 UTC 2016
esr at thyrsus.com said:
>> 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.
Where should that be documented? I think I set that when you sent out a
similar message a long time ago but I lost it when making a new clone.
Are there other git quirks that should be documented?
>> 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.
If the crap is in my local copy, I can move the whole directory to the side,
get a new clone, and merge my edits back in. Recovering my edits could be
ugly, but in the no-collision case it's not that hard. Diff the directories
to find the files you have edited, copy them over and commit...
>> 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.
I was thinking of looking for an exact match on the default commit message.
If there was a real collision the message should say something interesting.
These are my opinions. I hate spam.
More information about the devel