git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git difftool help

From
Chris Packham <judge.packham@gmail.com>
Date
Mar 29, 2016, 09:45 UTC
Message-ID
<CAFOYHZCS4McTJoFzBGDq763-ZNO==3H98sWLHmquZ8b=xek6hg@mail.gmail.com>
In-Reply-To
<CAGZFCEEYYwc=7z5+TRCxE=gR0od2X1oe1WgyhjvO6edb9yyM1A@mail.gmail.com>

On Tue, Mar 29, 2016 at 3:07 AM, ratheesh kannoth <ratheesh.ksz@gmail.com> wrote:

Show 8 quoted lines
> 'git diff 'is opening in meld. I could not create a patch using -  git
> diff > ./patch-01
> i did not make any change to pick meld, by  default it is picking meld.
>
>
> Which "git difftool" will help to create patch ? i do want to  use
> format patch as changes are not yet committed ?
>

'git diff' is the correct command to display a difference between the worktree and the index (staging area). 'git difftool' is used to invoke an external (usually graphical) tool to display the differences.

Perhaps you have some odd configuration causing meld to be invoked (diff.external maybe). Could you post the output of 'git config -l' and 'git --version'

Previous: ratheesh kannoth
Message 2 of 2 in “git difftool help”
  1. ratheesh kannothMar 28, 2016
  2. Chris PackhamMar 29, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.