RE: [csmith-project/csmith] 436852: merged yesterday's commits from SVN

["Xuejun Yang" <jxyang@cs.utah.edu>]

I manually merged it. Yes rebasing would be a much easier route. Thanks for
pointing out.

-Xuejun

> 
> A few comments:
> 
> 	Xuejun> Commit: 4368520e6f6c3eb7699d9ff6614c44daafeb913d
> 	Xuejun> merged yesterday's commits from SVN
> 
> A better log message would describe the changes, not just their
provenance.
> 
> 	Xuejun> Commit: 6179b7104b5f68b68462289c6386332ae17f5505
> 	Xuejun> Merge branch 'master' of github.com:csmith-project/csmith
> 
> Congrats on your first merge :-).  If you look at the history of the
project,
> you'll see that we have our first diamond.
> 
> But in this case, the merge is pretty trivial.  Each branch has one
commit, and
> the commits are trivially composable (because they touch different sets of
> files).  Many people like to avoid this sort of diamond history when the
work
> on each arm is simple.
> 
> One way to avoid this is to "rebase" your topic branch before you push
your
> work.  If you do this, then the resulting history becomes linear.
> 
> If you haven't looked up "rebasing" yet, let me encourage you to do so.
It is
> a very useful thing to have in your git toolbox.
> 
> Thanks! ---
> 
> 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