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

[Todd Tannenbaum <tannenba@xxxxxxxxxxx>]

Please enter the following commands wherever you clone the HTCondor repo 
to avoid polluting our git log with useless merge commits:
  git config --global branch.autosetuprebase always
  git config --global pull.rebase true
  git config --global branch.master.rebase true
  git config --global branch.V8_2-branch.rebase true

Thanks to Sir Derek Wright for the suggestion. :)

Thanks
Todd

---Details ---

So who else is tired of seeing all the useless micro-merges in the git 
history?  Not only is a pain when looking at repo history, the Build And 
Test Lab (batlab) does a build/test on every commit, *including* these 
useless 'merge' commits. So the poor batlab is doing a lot more 
building/testing than is required.
Seems like most of this pain and suffering could be avoided if folks did a
  git pull --rebase
instead of just a git pull.  If you enter the above git config commands, 
then a git pull will do a --rebase by default.  If for some reason you 
want a merge and not rebase (why?), you could always do
  git pull --no-rebase



--
Todd Tannenbaum <tannenba@xxxxxxxxxxx> University of Wisconsin-Madison
Center for High Throughput Computing   Department of Computer Sciences
HTCondor Technical Lead                1210 W. Dayton St. Rm #4257
Phone: (608) 263-7132                  Madison, WI 53706-1685