On Fri, May 25, 2012 at 11:42 AM, <org.fossil-scm.fossil-us...@io7m.com>wrote:
> Hello. > > 1) I created a private branch, made several commits, and then merged the > private branch with the current trunk. Rather than seeing the commits > I made on the private branch in the timeline for the trunk, I only see > the one large commit resulting from accumulating all the smaller commits > into one when merging. > > Is it possible to avoid squashing all private commits into one? > The branch is private. If all the individual commits where pushed out to the world, it wouldn't be private any more and the whole purpose of having a private branch would be defeated, no? > > 2) Additionally, as auto-sync was enabled, the large commit was pushed > to a remote. I realize it's not possible to rewrite history (nor would I > want to), but is there some way to push any changes I make whilst trying > to sort out item 1 above (so that the private commits are visible)? > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- D. Richard Hipp d...@sqlite.org
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
