All of lore.kernel.org
 help / color / mirror / Atom feed
From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
To: Joe Fiorini <joe@faithfulgeek.org>
Cc: git@vger.kernel.org
Subject: Re: Apply patch on server w/o git
Date: Tue, 25 Mar 2008 19:57:38 +0000	[thread overview]
Message-ID: <200803252057.38326.robin.rosenberg.lists@dewire.com> (raw)
In-Reply-To: <CA08AA77-A9EA-4490-B1BE-25E8B7402290@faithfulgeek.org>

Den Tuesday 25 March 2008 19.25.58 skrev Joe Fiorini:
> I am trying to generate a diff patch on my local dev box.  I want to
> upload this patch to a server (running Windows Server 2008) and apply
> it to my staging code.  The catch is: I cannot install git on the
> server to accept the patch.  Therefore, I would like to use a generic
> patching tool (such as patch from the GnuWin32 tools).  I tried
> generating a unified diff with the following command:
>
> git diff -U > diff.patch
>
> and then tried to apply it using:
>
> patch -u -i ..\other_dir\diff.patch

You can try git-apply instead of patch. It is a bit smarter (and not
outsmarting itself either).

-- robin

  parent reply	other threads:[~2008-03-25 19:58 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-25 18:25 Apply patch on server w/o git Joe Fiorini
2008-03-25 18:41 ` Bryan Donlan
2008-03-25 19:23   ` Joe Fiorini
2008-03-25 19:46   ` Jan Hudec
2008-03-25 19:57 ` Robin Rosenberg [this message]
2008-03-26  3:03   ` Joe Fiorini
2008-03-29 18:46     ` Jan Hudec

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=200803252057.38326.robin.rosenberg.lists@dewire.com \
    --to=robin.rosenberg.lists@dewire.com \
    --cc=git@vger.kernel.org \
    --cc=joe@faithfulgeek.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 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.