From: Mike Hommey <mh@glandium.org>
To: git@vger.kernel.org
Subject: [RFC] git rebase -s ours
Date: Sat, 1 Mar 2008 12:17:16 +0100 [thread overview]
Message-ID: <20080301111716.GA3263@glandium.org> (raw)
Hi,
What do you think git rebase -s ours should be considering as "ours"?
If I'm not mistaken, at the moment, "ours" stands for "upstream", which
is kind of confusing...
Mike
next reply other threads:[~2008-03-01 11:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-01 11:17 Mike Hommey [this message]
2008-03-02 1:05 ` [RFC] git rebase -s ours Jeff King
2008-03-02 12:48 ` Mike Hommey
2008-03-03 5:41 ` Jeff King
2008-03-03 6:55 ` Mike Hommey
2008-03-03 7:03 ` Jeff King
2008-03-03 7:04 ` Mike Hommey
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=20080301111716.GA3263@glandium.org \
--to=mh@glandium.org \
--cc=git@vger.kernel.org \
/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 NNTP newsgroup(s).