Thread (6 messages) flat view 6 messages, 4 authors, 2016-06-15

Re: git alias question

From: Michael Horowitz <hidden>
Date: 2016-06-15 22:52:42

The log operation does seem to make the most sense as the mechanism to
search for the results.  Making it work with difftool would work...
Not sure if "--log" to difftool or some other options as suggested in
the other thread would be most consistent UI-wise as stated, but
either would work for me.

On a separate note, some environment variable like GIT_PREFIX with the
CWD would make the alias functionality more flexible.

Mike

On Thu, Dec 29, 2011 at 8:59 PM, David Aguilar [off-list ref] wrote:
On Thu, Dec 29, 2011 at 9:08 AM, Dave Borowitz [off-list ref] wrote:
quoted
On Wed, Dec 28, 2011 at 17:27, Michael Horowitz
[off-list ref] wrote:
quoted
ldiff = "!git diff `git rev-list --reverse -n 2 HEAD -- $1` -- $1"
FWIW, you can also do this as:
 ldiff = log -p -1 --format=format: --
quoted
ldifft = "!git difftool `git rev-list --reverse -n 2 HEAD -- $1` -- $1"
I don't know that you can do something equivalent with difftool. I
suppose you could do the above with "GIT_EXTERNAL_DIFF=<some difftool
wrapper> git ldiff", but that's not very helpful.
difftool cannot be driven by log right now.  It is something we
thought would be helpful in the past:

http://thread.gmane.org/gmane.comp.version-control.git/114269/focus=114367

On 2009-03-23 Junio C Hamano <gitster <at> pobox.com> wrote:
quoted
Perhaps we would want a convenient way for "log -p" or "show -p" to drive
difftool as a backend?
I think that's exactly it.  difftool wraps diff; a log equivalent
would be quite helpful.

One idea is for difftool to learn a "--log" option to make it wrap log
instead.  I don't know if a diff-like command having a "--log" option
is ideal from a consistency-of-user-interface POV so I'm open to
ideas.  It is convenient, though.  It does seem like difftool would be
a good place to expose this feature.

I'd be interested in the "teach log / show -p about GIT_EXTERNAL_DIFF"
route, if that sounds like a good idea.
--
            David
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help