From: Christoph Hellwig <hch@infradead.org>
To: Niv Sardi <xaiki@sgi.com>
Cc: Russell Cattelan <cattelan@thebarn.com>, xfs@oss.sgi.com
Subject: Re: New XFS git tree on oss.sgi.com
Date: Tue, 9 Dec 2008 04:17:25 -0500 [thread overview]
Message-ID: <20081209091725.GA26180@infradead.org> (raw)
In-Reply-To: <ncc3ah6lyiw.fsf@itchy.melbourne.sgi.com>
Now that the xfs-dev branch was updated after a while I tried a git pull
an get a useless error message:
hch@bigmac:~/work/xfs-dev$ git-pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.origin/xfs-dev.merge' in
your configuration file does not tell me either. Please
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.
If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:
branch.origin/xfs-dev.remote = <nickname>
branch.origin/xfs-dev.merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>
See git-config(1) for details.
Can you please make each of the current branches a proper git tree
that is easy to work with? Alternatively I'll just completely stop
bothering with the dev tree if it's such a pain in the ass.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2008-12-09 9:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-25 7:22 New XFS git tree on oss.sgi.com Lachlan McIlroy
2008-11-25 8:16 ` Christoph Hellwig
2008-11-25 14:27 ` Russell Cattelan
2008-11-25 21:42 ` Mark Goodwin
2008-11-26 3:30 ` Christoph Hellwig
2008-11-26 3:36 ` Russell Cattelan
2008-11-26 1:03 ` Lachlan McIlroy
2008-11-26 1:17 ` Timothy Shimmin
2008-11-26 3:26 ` Russell Cattelan
2008-12-03 3:37 ` Niv Sardi
2008-12-09 9:17 ` Christoph Hellwig [this message]
2008-12-09 16:20 ` Russell Cattelan
2008-12-09 16:57 ` Christoph Hellwig
2008-12-09 17:12 ` Russell Cattelan
2008-12-09 22:20 ` Niv Sardi
2008-12-10 0:07 ` Russell Cattelan
2008-12-10 0:46 ` Mark Goodwin
2008-12-10 1:14 ` Niv Sardi
2008-12-10 6:51 ` Christoph Hellwig
2008-11-26 3:30 ` Christoph Hellwig
2008-11-26 1:00 ` Lachlan McIlroy
2008-11-26 2:00 ` Dave Chinner
2008-11-26 3:29 ` Timothy Shimmin
2008-11-26 4:08 ` Dave Chinner
2008-11-26 5:41 ` Timothy Shimmin
2008-12-04 13:26 ` Christoph Hellwig
2008-12-05 3:29 ` Niv Sardi
2008-12-03 3:45 ` Niv Sardi
2008-11-26 3:28 ` Christoph Hellwig
2008-11-25 14:05 ` Christoph Hellwig
2008-11-26 1:11 ` Lachlan McIlroy
2008-11-26 3:27 ` Christoph Hellwig
2008-12-03 3:48 ` Niv Sardi
2008-12-03 13:04 ` Christoph Hellwig
2008-12-03 23:58 ` Niv Sardi
2008-12-04 12:34 ` Christoph Hellwig
2008-11-26 3:40 ` Eric Sandeen
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=20081209091725.GA26180@infradead.org \
--to=hch@infradead.org \
--cc=cattelan@thebarn.com \
--cc=xaiki@sgi.com \
--cc=xfs@oss.sgi.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