Re: [HTCondor-devel] [htcondor-fw] If you push to the HTCondor repo, please read this... (rebase vs merge)

[Todd L Miller <tlmiller@xxxxxxxxxxx>]

> ASAP stop doing rebases when merging. It can create duplicate commits 
> with different SHA1s.  This is actually happening in our repository:
	That is to say, if you made rebase the default on pulls, please 
revert that change.  It appears (based on some brief experimentation), if 
you remove or comment out lines like the following from your ~/.gitconfig, 
that you don't need to make any changes to any of your repositories:
# [pull]
#   rebase = true
# [branch "master"]
#   rebase = true
# [branch "V8_2-branch"]
#   rebase = true

- ToddM