From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Subject: Re: git rebase: unexpected conflict
Date: Sun, 04 Feb 2007 20:33:50 +0100 [thread overview]
Message-ID: <eq5cc6$al2$1@sea.gmane.org> (raw)
In-Reply-To: 20070204190519.GB29029@mellanox.co.il
Michael S. Tsirkin wrote:
> git rebase seems to see conflicts where there shouldn't be any.
Were you on a branch that you wanted to rebase? I had made this error once.
git rebase --onto <newbase> <upstream> <branch> moves <upstream>..<branch>
into <newbase>.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2007-02-04 19:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-04 19:05 git rebase: unexpected conflict Michael S. Tsirkin
2007-02-04 19:33 ` Jakub Narebski [this message]
2007-02-04 20:53 ` Michael S. Tsirkin
2007-02-07 19:32 ` Junio C Hamano
2007-02-07 20:05 ` Michael S. Tsirkin
2007-02-07 20:13 ` Junio C Hamano
2007-02-07 20:31 ` Michael S. Tsirkin
2007-02-07 20:37 ` Junio C Hamano
2007-02-07 21:14 ` Michael S. Tsirkin
2007-02-07 21:22 ` Junio C Hamano
2007-02-08 13:39 ` Michael S. Tsirkin
2007-02-08 22:27 ` Junio C Hamano
2007-02-08 22:29 ` Michael S. Tsirkin
2007-02-09 10:23 ` Michael S. Tsirkin
2007-02-07 20:30 ` Linus Torvalds
2007-02-07 20:22 ` Linus Torvalds
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='eq5cc6$al2$1@sea.gmane.org' \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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