Re: git merge (again) (was Re: [csmith-project/csmith] 0229d0: ...)

[Eric Eide <eeide@cs.utah.edu>]

	Eric> See yesterday's email for discussion about how to avoid merge
	Eric> commits for little bits of work.

As some evidence of the usefulness of rebasing, consider the current history:

  [clos:] eeide% git log --graph --oneline -n 10
  * 90fb2dc Use `*_HOME' instead of `*_PATH' variable names consistently.
  * 9cbc259 Rename environment variable `CSMITH_PATH' to `CSMITH_HOME'.
  *   e26ec75 Merge branch 'master' of github.com:csmith-project/csmith
  |\  
  | * 4dd3514 Quick hack to speed up c_delta: try removing all extra whitespace
  | *   878f618 Merge branch 'master' of github.com:csmith-project/csmith
  | |\  
  | | * a0cabb4 Reported one more clang wrong code bug
  | * | cef5282 More paths wrong...
  | |/  
  | * 5cb9751 Fixup a path.
  * | 0229d0c fix a assertion failure during generation for seed 1080606471.
  |/  
  * 4919caf One more gcc crash bug reported by Arthur O'Dwyer

We now have three parallel lines of development in the recent history.  While
this is true, it is not very "interesting" in some sense, and this is why
people try to avoid it.

If I hadn't rebased my CSMITH_HOME hackery, we could have had an even more
uninterestingly tangled history :-).

Eric.

-- 
-------------------------------------------------------------------------------
Eric Eide <eeide@cs.utah.edu>  .         University of Utah School of Computing
http://www.cs.utah.edu/~eeide/ . +1 (801) 585-5512 voice, +1 (801) 581-5843 FAX