zsh-workers
 help / color / mirror / code / Atom feed
From: Mikael Magnusson <mikachu@gmail.com>
To: Ray Andrews <rayandrews@eastlink.ca>
Cc: zsh workers <zsh-workers@zsh.org>
Subject: Re: trouble with debugging binary
Date: Sun, 23 Nov 2014 19:12:21 +0100	[thread overview]
Message-ID: <CAHYJk3R7kW7avPk6W+2Zi9p8Yxn-C2RVFLs98JrvUiPQTAQqVA@mail.gmail.com> (raw)
In-Reply-To: <547209BD.4070605@eastlink.ca>

On Sun, Nov 23, 2014 at 5:22 PM, Ray Andrews <rayandrews@eastlink.ca> wrote:
> On 11/22/2014 11:58 PM, Lawrence Velázquez wrote:
>>
>> On Nov 22, 2014, at 11:49 AM, Ray Andrews <rayandrews@eastlink.ca> wrote:
>
> Lawrence,
>
>>    The "unified" format is quite common. I personally have a hard time
>> reading diffs in other formats.
>> https://en.wikipedia.org/wiki/Diff_utility#Unified_format vq
>
> Thanks, that is very informative.  I never looked at the switches for
> 'diff'.  So this means that we can patch the output from 'git diff' then so
> long as we have the whole file?  It will be interesting to see, at the next
> 'pull' if git recognizes the patch or complains.

If you think "git pull" downloads patches and applies them locally,
you are completely mistaken :). As a sidenote, you can produce patches
with git that 'patch' cannot apply, if you specify -M and/or -C. 'git
am' or 'git apply' are always able to apply these though, of course.

I'm actually a bit confused about what you consider the 'normal' diff
format, almost nobody uses anything other than the unified format.

-- 
Mikael Magnusson


  reply	other threads:[~2014-11-23 18:12 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-17 21:36 PATCH: key bindings, fixes, docs, tests for vi stuff Oliver Kiddle
2014-11-18  8:04 ` Jun T.
2014-11-19  8:48   ` Oliver Kiddle
2014-11-19 15:35     ` Ray Andrews
2014-11-21  0:01   ` Oliver Kiddle
2014-11-21  0:49     ` Bart Schaefer
2014-11-21  1:10       ` Ray Andrews
2014-11-21  5:53         ` Bart Schaefer
2014-11-21 10:35       ` Oliver Kiddle
2014-11-22  6:59         ` Bart Schaefer
2014-12-12 16:47           ` Oliver Kiddle
2014-11-21  1:15     ` Ray Andrews
2014-11-21  2:20       ` Mikael Magnusson
2014-11-21  2:38         ` Ray Andrews
2014-11-21  6:23           ` Bart Schaefer
2014-11-21 17:28             ` trouble with debugging binary Ray Andrews
2014-11-22  4:45               ` Bart Schaefer
2014-11-22  5:27                 ` Ray Andrews
2014-11-22  5:43                 ` Bart Schaefer
2014-11-22 16:49                   ` Ray Andrews
2014-11-22 22:35                     ` Bart Schaefer
2014-11-23  7:58                     ` Lawrence Velázquez
2014-11-23 16:22                       ` Ray Andrews
2014-11-23 18:12                         ` Mikael Magnusson [this message]
2014-11-23 18:42                           ` Ray Andrews
2014-11-23 19:01                             ` Mikael Magnusson
2014-11-23 22:30                               ` Ray Andrews
2014-11-21 15:20     ` PATCH: key bindings, fixes, docs, tests for vi stuff Jun T.

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=CAHYJk3R7kW7avPk6W+2Zi9p8Yxn-C2RVFLs98JrvUiPQTAQqVA@mail.gmail.com \
    --to=mikachu@gmail.com \
    --cc=rayandrews@eastlink.ca \
    --cc=zsh-workers@zsh.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.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).