Re: [Sugar-devel] Analysing code changes, git diff

2010-09-14 Thread Tomeu Vizoso
On Fri, Sep 10, 2010 at 18:05, Sascha Silbe wrote: > Excerpts from Tomeu Vizoso's message of Thu Sep 09 15:01:01 +0200 2010: > >> Don't know about better diffs, but I like meld as driven by git mergetool. > > I like doing the merging in my text editor (though the presentation > meld uses is intere

Re: [Sugar-devel] Analysing code changes, git diff

2010-09-10 Thread Sascha Silbe
Excerpts from Tomeu Vizoso's message of Thu Sep 09 15:01:01 +0200 2010: > Don't know about better diffs, but I like meld as driven by git mergetool. I like doing the merging in my text editor (though the presentation meld uses is interesting). You don't happen to know how I could tell git to incl

Re: [Sugar-devel] Analysing code changes, git diff

2010-09-09 Thread James Cameron
git diff --patience Generated more useful output for me than the default, in the context of the changes I was making. The same option is valid for git format-patch The resulting diffs were semantically equivalent, but the --patience diff was longer, and in my case easier to understand. Here's t

Re: [Sugar-devel] Analysing code changes, git diff

2010-09-09 Thread Daniel Drake
On 9 September 2010 07:02, Simon Schampijer wrote: > FWIW, I understand your example and the frustration well. Have been put > off by it myself. I often use the diff and the copy of the original code > and/or final code near by to understand bigger refactorings. Which is > not very handy of course

Re: [Sugar-devel] Analysing code changes, git diff

2010-09-09 Thread Simon Schampijer
On 09/09/2010 02:08 PM, Sascha Silbe wrote: > Excerpts from James Cameron's message of Thu Sep 09 03:24:36 +0200 2010: > >> Sorry, I used tabify in emacs, so as to force the diff to show the >> entire function as changed. I had said I "replaced tabs with spaces", >> but I should have said "replace

Re: [Sugar-devel] Analysing code changes, git diff

2010-09-09 Thread Tomeu Vizoso
On Thu, Sep 9, 2010 at 14:08, Sascha Silbe wrote: > Excerpts from James Cameron's message of Thu Sep 09 03:24:36 +0200 2010: > >> Sorry, I used tabify in emacs, so as to force the diff to show the >> entire function as changed.  I had said I "replaced tabs with spaces", >> but I should have said "

[Sugar-devel] Analysing code changes, git diff

2010-09-09 Thread Sascha Silbe
Excerpts from James Cameron's message of Thu Sep 09 03:24:36 +0200 2010: > Sorry, I used tabify in emacs, so as to force the diff to show the > entire function as changed. I had said I "replaced tabs with spaces", > but I should have said "replaced spaces with tabs". This is only > because I don