RE: [csmith-project/csmith] 4ba524: fix a bug in calculating size of fields inside pac...

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

I run into this situation a couple of times: I forget, or didn't realize I need, to pull on master branch before rebasing+merging the topic branch. Once the merge is done, the damage is done. Even if I pull on the master again, and redo rebasing + merging with the topic branch, I lost the capability of fast forwarding.

My questions are:

1) if there a way to back out from the 1st rebasing+merging. I remember I tried stash, but it didn't work.

2) even better, is there a way automatically pull on the master branch whenever somebody else commits while I am working on a topic branch?

-Xuejun

> -----Original Message-----
> From: csmith-commits-bounces@flux.utah.edu
> [mailto:csmith-commits-bounces@flux.utah.edu] On Behalf Of Xuejun Yang
> Sent: Monday, July 11, 2011 9:26 PM
> To: csmith-commits@flux.utah.edu
> Subject: [csmith-project/csmith] 4ba524: fix a bug in calculating size of fields
> inside pac...
> 
>   Branch: refs/heads/master
>   Home:   https://github.com/csmith-project/csmith
> 
>   Commit: 4ba524b279a958b12d7b0c6e7848388c0e4aafea
> 
> https://github.com/csmith-project/csmith/commit/4ba524b279a958b12d7b0c
> 6e7848388c0e4aafea
>   Author: Xuejun Yang <jxyang@cs.utah.edu>
>   Date:   2011-07-11 (Mon, 11 Jul 2011)
> 
>   Changed paths:
>     M src/Type.cpp
> 
>   Log Message:
>   -----------
>   fix a bug in calculating size of fields inside packed structs
> 
> 
>   Commit: 2a553b80234fe90e1dce9dbe002c1891e4dad3fd
> 
> https://github.com/csmith-project/csmith/commit/2a553b80234fe90e1dce9db
> e002c1891e4dad3fd
>   Author: Xuejun Yang <jxyang@cs.utah.edu>
>   Date:   2011-07-11 (Mon, 11 Jul 2011)
> 
>   Changed paths:
>     M .gitignore
>   M src/Makefile.in
> 
>   Log Message:
>   -----------
>   Merge branch 'master' of github.com:csmith-project/csmith
> 
> 
> Compare:
> https://github.com/csmith-project/csmith/compare/62b8e5d...2a553b8