All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shawn Pearce <spearce@spearce.org>
To: Kevin Shanahan <kmshanah@disenchant.net>
Cc: git@vger.kernel.org
Subject: Re: Problem with git-apply?
Date: Sat, 4 Nov 2006 02:30:00 -0500	[thread overview]
Message-ID: <20061104073000.GB9422@spearce.org> (raw)
In-Reply-To: <20061104072349.GA19667@cubit>

Kevin Shanahan <kmshanah@disenchant.net> wrote:
>     git apply ../test.diff

Try:

      git apply --index ../test.diff

instead.  The --index is needed to record the new file in the index;
otherwise it won't actually be added during commit.

-- 

  reply	other threads:[~2006-11-04  7:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-04  7:23 Problem with git-apply? Kevin Shanahan
2006-11-04  7:30 ` Shawn Pearce [this message]
2006-11-04  8:07 ` Kevin Shanahan
2006-11-04  9:26 ` Jakub Narebski
2006-11-04 10:12   ` Kevin Shanahan
2006-11-04  9:49 ` Junio C Hamano
2006-11-04 10:00   ` Junio C Hamano
2006-11-04 10:15     ` Junio C Hamano
2006-11-04 10:49       ` Kevin Shanahan
2006-11-04 16:27   ` Linus Torvalds
2006-11-04 18:33     ` Junio C Hamano

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=20061104073000.GB9422@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=kmshanah@disenchant.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.