From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20662 invoked by alias); 9 Mar 2011 10:44:14 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 20647 invoked by uid 22791); 9 Mar 2011 10:44:13 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Date: Wed, 09 Mar 2011 10:44:00 -0000 From: Joel Brobecker To: Pierre Muller Cc: archer@sourceware.org Subject: Re: [Archer] Remote repository and git push command Message-ID: <20110309104340.GN19402@adacore.com> References: <000001cbde44$fb9fd710$f2df8530$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <000001cbde44$fb9fd710$f2df8530$@muller@ics-cnrs.unistra.fr> User-Agent: Mutt/1.5.20 (2009-06-14) X-SW-Source: 2011-q1/txt/msg00121.txt.bz2 > If I make change to my branch, but also want to rebase my branch to > current HEAD, I get a warning about "loosing history" when I try to > push the new version onto the remote repository. That's the disadvantage of using rebase. Rebase is great because it keeps the history linear. But the downside is that it makes it more difficult for others to track and make changes on top of your branch. > It is allowed to force the push in that case or how should I proceed > to avoid the "losing history" complaint. I don't know what the policy is on the Archer branch, or whether there is one or not. Given that you are doing the work using git mostly to be able to maintain a set of patches, I think that you would really benefit from using rebasing, rather than merging. As there is no one else pushing changes on that branch, it shouldn't have any impact on anyone else. Anyone more actively maintaining the Archer repo should be able to give you the final OK (or not). -- Joel