From: Juri Linkov <juri@linkov.net>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: Stefan Monnier <monnier@IRO.UMontreal.CA>, emacs-devel@gnu.org
Subject: Re: Merge-base alias for git vc-diff
Date: Fri, 11 Jan 2019 01:25:31 +0200 [thread overview]
Message-ID: <87y37s2iz8.fsf@mail.linkov.net> (raw)
In-Reply-To: <2f8d1386-2f27-6c30-3842-aa36847d2143@yandex.ru> (Dmitry Gutov's message of "Fri, 11 Jan 2019 01:14:37 +0300")
>> This means that this feature should be used only this way:
>>
>> C-u C-x v D master...branch RET branch RET
>
> We could use a more special syntax for this, in order for the user not to
> be confused regarding master...branch..branch.
>
> For example:
>
> C-u C-x v D master^branch RET branch RET
>
> Hopefully not many branches have a ^ in their names.
This is too ad-hoc syntax that might conflict with some VCS special syntax
like HEAD^2.
Let me remind that "git diff A...B" is equivalent to
"git diff $(git-merge-base A B) B".
So we have at least 3 possible solutions:
C-u C-x v D master...branch RET branch RET -- where master...branch
-- internally is substituted
-- by the merge-base revision
-- found by "git-merge-base master branch"
C-u C-x v D master...branch RET RET -- shortcut of the above, but the problem is
-- how to get "branch" from rev1
-- when rev2 is empty
C-x v M D master RET branch RET -- special command for merge-base revisions
next prev parent reply other threads:[~2019-01-10 23:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-26 22:32 Merge-base alias for git vc-diff Juri Linkov
2018-12-27 1:07 ` Dmitry Gutov
2018-12-27 20:02 ` Juri Linkov
2018-12-27 20:42 ` Dmitry Gutov
2018-12-28 17:53 ` Stefan Monnier
2018-12-29 21:39 ` Juri Linkov
2019-01-02 0:14 ` Juri Linkov
2019-01-02 1:55 ` Stefan Monnier
2019-01-02 15:34 ` João Távora
2019-01-02 22:25 ` Dmitry Gutov
2019-01-02 22:48 ` João Távora
2019-01-02 23:07 ` Dmitry Gutov
2019-01-03 3:22 ` Stefan Monnier
2019-01-03 13:30 ` João Távora
2019-01-03 20:38 ` Juri Linkov
2019-01-03 21:44 ` João Távora
2019-01-05 22:28 ` Juri Linkov
2019-01-07 22:33 ` Juri Linkov
2019-01-08 14:58 ` Stefan Monnier
2019-01-09 0:05 ` Juri Linkov
2019-01-02 21:29 ` Juri Linkov
2019-01-03 3:40 ` Stefan Monnier
2019-01-10 21:25 ` Juri Linkov
2019-01-10 22:14 ` Dmitry Gutov
2019-01-10 23:25 ` Juri Linkov [this message]
2019-01-10 22:41 ` Stefan Monnier
2019-01-10 23:18 ` Juri Linkov
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=87y37s2iz8.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.