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

Re: How to git diff files in renamed directories

From
NKNeal Kreitzinger <nkreitzinger@gmail.com>
Date
Mar 15, 2012, 10:30 UTC
Message-ID
<4F61C4BB.20908@gmail.com>
In-Reply-To
<CAGATVH7KCr+dJNpx18==3BT8pzsvKeV5aYRWKts7xH0YZ8yaKw@mail.gmail.com>
On 3/15/2012 3:32 AM, Patrick Sabin wrote:
Show 32 quoted lines
>
> I want to diff a renamed file (to a different directory) in different commits.
>
> File a was moved to the file subdir/c
>
> I tried:
>
> $ git diff b616d 0aa0 -- subdir/c a
>
> but git seems to always diff against /dev/null:
>
> diff --git a/a b/a
> new file mode 100644
> index 0000000..2e5ada8
> --- /dev/null
> +++ b/a
> @@ -0,0 +1 @@
> +File a
> diff --git a/subdir/c b/subdir/c
> deleted file mode 100644
> index 24c846c..0000000
> --- a/subdir/c
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -File b
> -Another b change.
>
> git log --follow subdir/c   recognizes that the file has been renamed
> and moved to subdirectory.
>
> Is there any way to get such a diff in git?
>
git diff b616d:a 0aa0:subdir/c is one way to do it.

v/r, neal

Previous: Damien WyartNext: Junio C Hamano
Message 3 of 4 in “How to git diff files in renamed directories”
  1. Patrick SabinMar 15, 2012
  2. Damien WyartMar 15, 2012
  3. Neal KreitzingerMar 15, 2012
  4. Junio C HamanoMar 15, 2012

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.