From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2108 invoked by alias); 11 Mar 2011 11:35:10 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 1860 invoked by uid 22791); 11 Mar 2011 11:35:08 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Date: Fri, 11 Mar 2011 11:35:00 -0000 From: Jan Kratochvil To: Pierre Muller Cc: "'Tom Tromey'" , "'Joel Brobecker'" , archer@sourceware.org Subject: Re: [Archer] Remote repository and git push command Message-ID: <20110311113427.GA9600@host1.jankratochvil.net> References: <000001cbde44$fb9fd710$f2df8530$@muller@ics-cnrs.unistra.fr> <20110309104340.GN19402@adacore.com> <000001cbdfd7$979b6f60$c6d24e20$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <000001cbdfd7$979b6f60$c6d24e20$@muller@ics-cnrs.unistra.fr> User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2011-q1/txt/msg00126.txt.bz2 On Fri, 11 Mar 2011 11:32:15 +0100, Pierre Muller wrote: > As I don't expect this for now, > I tried to push my locally rebased files: > > $ git push --force > error: failed to push some refs to 'ssh://sourceware.org/git/archer.git' FYI I just `git merge origin/master'. When one wants to get a single diff `git diff origin/master'. For log of all the changes not cluttered by upstream changes `git log --no-merges --first-parent'. For preparing a submit upstream in a split form I use some inappropriate different scripts, though. This makes the changes linear with no problems for pull/push and no need for --force. Regards, Jan