Re: Change in git-svn dcommit semantics?

Brian Gernhardt [off-list ref] writes:

And is there an easier way to find these things than "git rev-list
HEAD | git diff-tree -r -s --stdin -SCOLLISION | xargs git show"?  I
cobbled that together from poking around inside gitk (which mostly
works in OS X, but has some issues that make me prefer the command
line).

I typically do:

	git log --full-diff -p -SCOLLISION

The --full-diff option helps because it shows the diff for other
files (that do not have different number of substring COLLISION
in the pre and postimage) in the same commit as well.

On Dec 20, 2006, at 6:57 AM, Jeff King wrote:

On Wed, Dec 20, 2006 at 06:47:45AM -0500, Brian Gernhardt wrote:

quoted

quoted

quoted

The --full-diff option helps because it shows the diff for other
files (that do not have different number of substring COLLISION
in the pre and postimage) in the same commit as well.

Yet another undocumented option. Sigh...

I'd send in a patch to fix that (little gnome work is what I do in
Wikipedia, and seems to be what I do here), but the option seems to
be in setup_revision.c:setup_revisions, which is used in several
places.  Is there a central place to put that in the documentation?
Should there be?

Please read the rest of the thread for some explanation from Junio on
how this option works.

I was trying to write quick documentation for this option, placing it  
in Documentation/diff-options.txt (is that the right place for it?),  
when I ran across --pickaxe-all.  How do the two options differ?

~~ Brian

Junio C Hamano wrote:

Brian Gernhardt [off-list ref] writes:

quoted

And is there an easier way to find these things than "git rev-list
HEAD | git diff-tree -r -s --stdin -SCOLLISION | xargs git show"?  I
cobbled that together from poking around inside gitk (which mostly
works in OS X, but has some issues that make me prefer the command
line).

I typically do:

      git log --full-diff -p -SCOLLISION

The --full-diff option helps because it shows the diff for other
files (that do not have different number of substring COLLISION
in the pre and postimage) in the same commit as well.

Yet another undocumented option. Sigh...
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

On Wed, Dec 20, 2006 at 06:47:45AM -0500, Brian Gernhardt wrote:

quoted

quoted

The --full-diff option helps because it shows the diff for other
files (that do not have different number of substring COLLISION
in the pre and postimage) in the same commit as well.

Yet another undocumented option. Sigh...

I'd send in a patch to fix that (little gnome work is what I do in  
Wikipedia, and seems to be what I do here), but the option seems to  
be in setup_revision.c:setup_revisions, which is used in several  
places.  Is there a central place to put that in the documentation?   
Should there be?

Please read the rest of the thread for some explanation from Junio on
how this option works.

I think it makes sense to group the porcelain-ish options together for
git-log/git-whatchanged (and potentially git-show). Really, they can
take any of the diff-options or any of the rev-list options.  The
rev-list options are not currently grouped for inclusion in another man
page. The diff options are available in diff-options.txt, but are not
included by the log manpages.  They probably should be.

On Dec 20, 2006, at 6:38 AM, Jakub Narebski wrote:

Junio C Hamano wrote:

quoted

The --full-diff option helps because it shows the diff for other
files (that do not have different number of substring COLLISION
in the pre and postimage) in the same commit as well.

Yet another undocumented option. Sigh...

I'd send in a patch to fix that (little gnome work is what I do in  
Wikipedia, and seems to be what I do here), but the option seems to  
be in setup_revision.c:setup_revisions, which is used in several  
places.  Is there a central place to put that in the documentation?   
Should there be?