This is the mail archive of the
archer@sourceware.org
mailing list for the Archer project.
Re: [Archer] Remote repository and git push command
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: Pierre Muller <pierre dot muller at ics-cnrs dot unistra dot fr>
- Cc: "'Tom Tromey'" <tromey at redhat dot com>, "'Joel Brobecker'" <brobecker at adacore dot com>, archer at sourceware dot org
- Date: Fri, 11 Mar 2011 12:34:27 +0100
- Subject: Re: [Archer] Remote repository and git push command
- References: <000001cbde44$fb9fd710$f2df8530$@muller@ics-cnrs.unistra.fr><20110309104340.GN19402@adacore.com><m3ipvq8x13.fsf@fleche.redhat.com><000001cbdfd7$979b6f60$c6d24e20$@muller@ics-cnrs.unistra.fr>
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