From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Adrian Klingel <Adrian.Klingel@illumaware.com>
Cc: git@vger.kernel.org
Subject: Re: git rebase --continue with goofy error
Date: Thu, 4 Dec 2008 17:27:57 +0100 [thread overview]
Message-ID: <20081204162757.GA23360@atjola.homenet> (raw)
In-Reply-To: <5AC243B6-F048-4286-80E1-1D0E695792B9@illumaware.com>
On 2008.12.04 09:55:55 -0500, Adrian Klingel wrote:
> And I get the following:
>
> *********
> mymac:/Library/mydir/code/myapp me$ git rebase --continue
> Unknown option: 1
> Usage: head [-options] <url>...
> -m <method> use method for the request (default is 'HEAD')
> -f make request even if head believes method is illegal
> -b <base> Use the specified URL as base
> -t <timeout> Set timeout value
> -i <time> Set the If-Modified-Since header on the request
> -c <conttype> use this content-type for POST, PUT, CHECKIN
> -a Use text mode for content I/O
> -p <proxyurl> use this as a proxy
> -P don't load proxy settings from environment
> -H <header> send this HTTP header (you can specify several)
>
> -u Display method and URL before any response
> -U Display request headers (implies -u)
> -s Display response status code
> -S Display response status chain
> -e Display response headers
> -d Do not display content
> -o <format> Process HTML content in various ways
>
> -v Show program version
> -h Print this message
>
> -x Extra debugging output
That comes via git-am which used to call "head -1", but using -<n> is
deprecated and apparently not supported anymore by modern versions of
coreutils. Was fixed in:
1d9b2656: git-am: head -1 is obsolete and doesn't work on some new systems
Which is in git 1.5.6.
Björn
next prev parent reply other threads:[~2008-12-04 16:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-04 14:55 git rebase --continue with goofy error Adrian Klingel
[not found] ` <9F631552-BA29-4A85-9A85-2992232CDDE6@railsnewbie.com>
2008-12-04 16:24 ` Adrian Klingel
2008-12-04 16:27 ` Björn Steinbrink [this message]
2008-12-04 16:32 ` Michael J Gruber
2008-12-04 16:40 ` Adrian Klingel
2008-12-04 17:43 ` Johannes Schindelin
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=20081204162757.GA23360@atjola.homenet \
--to=b.steinbrink@gmx.de \
--cc=Adrian.Klingel@illumaware.com \
--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