From: Linus Torvalds <torvalds@osdl.org>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Commit-ish shortcut for immediate parent range
Date: Sun, 22 Oct 2006 20:33:00 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0610222029390.3962@g5.osdl.org> (raw)
In-Reply-To: <ehgoii$1ap$1@sea.gmane.org>
On Sun, 22 Oct 2006, Jakub Narebski wrote:
>
> BTW. what does "recursive diff" mean (in git)?
For projects with subdirectories (and git itself has almost none), the
default "raw, nonrecursive" diff looks something like this:
f8829caee311207afbc882794bdc5aa0db5caf33
:040000 040000 db7ae247da2ede4d0f932b86771424534d2960b8 9033be5eb62db6fd778793f9f51e28734bb3d9f8 M arch
:040000 040000 c96e5293819986ae7c13a8ef779c5f2066b9575f 5950afceabd99053964778b49df19ba794a21b75 M include
while the same commit with "raw, recursive" looks like
f8829caee311207afbc882794bdc5aa0db5caf33
:100644 100644 88b72c9a84957f2ac787ccf83fa46c4dbb0818d2 2de4d3c367a2c2da9adb6bcf29b5105c46c01f78 M arch/mips/mm/init.c
:100644 100644 4bdaa05f485b446e0d66587015cbd8378abf4a69 4a61e624b0ecfcd921a560d426e92e1df2df1de2 M arch/mips/mm/pgtable-32.c
:100644 100644 44b5e97fff65f75286fdd15f33c2bcf40841082a 8d600d307d5ddb3f617ffc34929ea98d4613b4a7 M arch/mips/mm/pgtable-64.c
:100644 100644 9ab59e2bb23368530fa67c95af0d6ab2c4f7fe8f e3c9925876a3ce4eb80ec67937362cd7d014ad2f M include/asm-mips/cacheflush.h
:100644 100644 6959bdb59310b096ec7797e0a31c78fde5aa9afc 02c8a13fc894838b27336ae42fbb542f87132e01 M include/asm-mips/fixmap.h
ie the "recursive" diff will recurse into subdirectories.
A _patch_ is always recursive (you cannot make a patch-like diff for just
the "tree entry", only for actual blobs), so you can only see this
difference for raw git SHA1 diffs.
Linus
next prev parent reply other threads:[~2006-10-23 3:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-22 14:48 Commit-ish shortcut for immediate parent range Andy Parkins
2006-10-22 15:11 ` Jakub Narebski
2006-10-22 17:25 ` Linus Torvalds
2006-10-22 18:25 ` Linus Torvalds
2006-10-22 20:17 ` Andy Parkins
2006-10-22 20:56 ` Linus Torvalds
2006-10-22 21:41 ` Jakub Narebski
2006-10-22 22:09 ` Johannes Schindelin
2006-10-22 22:33 ` Jakub Narebski
2006-10-22 23:36 ` Junio C Hamano
2006-10-23 3:33 ` Linus Torvalds [this message]
2006-10-22 20:55 ` Johannes Schindelin
2006-10-22 19:53 ` Jeff King
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=Pine.LNX.4.64.0610222029390.3962@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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.
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).