From: Jan Kratochvil <jan.kratochvil@redhat.com>
To: Pierre Muller <pierre.muller@ics-cnrs.unistra.fr>
Cc: "'Tom Tromey'" <tromey@redhat.com>,
"'Joel Brobecker'" <brobecker@adacore.com>,
archer@sourceware.org
Subject: Re: [Archer] Remote repository and git push command
Date: Fri, 11 Mar 2011 11:35:00 -0000 [thread overview]
Message-ID: <20110311113427.GA9600@host1.jankratochvil.net> (raw)
In-Reply-To: <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
prev parent reply other threads:[~2011-03-11 11:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-09 10:30 Pierre Muller
2011-03-09 10:44 ` [Archer] " Joel Brobecker
2011-03-10 21:51 ` Tom Tromey
2011-03-11 10:32 ` Pierre Muller
2011-03-11 11:35 ` Jan Kratochvil [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110311113427.GA9600@host1.jankratochvil.net \
--to=jan.kratochvil@redhat.com \
--cc=archer@sourceware.org \
--cc=brobecker@adacore.com \
--cc=pierre.muller@ics-cnrs.unistra.fr \
--cc=tromey@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).