Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: trouble with debugging binary

On 11/23/2014 10:12 AM, Mikael Magnusson wrote:

If you think "git pull" downloads patches and applies them locally,
you are completely mistaken :).

I'm thinking that git does everything with 'patches', although
they might not be called that. Nevermind tho, I'm reading the
doc, and will understand it all in time. Anyway, what I meant
was that if I patch something here by hand, and then 'pull' ,
*and* that same patch has been applied upstream,
will git recognize the local patch as kosher, or will it complain that
the file has been locally changed.

Trying it, I see that git does *not* see the patch as kosher and
demands that I 'stash' it. git is very fussy, just as it should be.

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

... just 'diff' with no switches.  Now that I try 'diff -u' I see what you
mean--that's what I normally see, I just didn't know how to produce
that format, now I do. It sure is easier to read.

Messages sorted by: Reverse Date, Date, Thread, Author