diff options
| author | Juri Linkov | 2019-03-25 23:45:31 +0200 |
|---|---|---|
| committer | Juri Linkov | 2019-03-25 23:45:31 +0200 |
| commit | d43af7b64bd22724e5e9a624bcc06b4ed28faf73 (patch) | |
| tree | c67ea4d1d90dca703dccfa0106c181dc109d676e /etc | |
| parent | db53731c5f7e11240244161623b82b55cf303043 (diff) | |
| download | emacs-d43af7b64bd22724e5e9a624bcc06b4ed28faf73.tar.gz emacs-d43af7b64bd22724e5e9a624bcc06b4ed28faf73.zip | |
* lisp/vc/vc.el (vc-diff-mergebase, vc-log-mergebase): New commands.
* lisp/vc/vc-git.el (vc-git-mergebase): New function.
(vc-git-print-log): Interpret string value of arg LIMIT as an end-revision.
* lisp/vc/vc-hooks.el (vc-prefix-map): Bind 'vc-log-mergebase' to
'C-x v M L', and 'vc-diff-mergebase' to 'C-x v M D'. (Bug#33950)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -511,6 +511,10 @@ and compares their entire trees. | |||
| 511 | *** New user option 'vc-hg-revert-switches' specifies switches to pass | 511 | *** New user option 'vc-hg-revert-switches' specifies switches to pass |
| 512 | to hg revert. | 512 | to hg revert. |
| 513 | 513 | ||
| 514 | *** 'C-x v M D' ('vc-diff-mergebase') and 'C-x v M L' ('vc-log-mergebase') | ||
| 515 | print diffs and logs between the merge base (common ancestor) of two | ||
| 516 | given revisions. | ||
| 517 | |||
| 514 | ** Diff mode | 518 | ** Diff mode |
| 515 | +++ | 519 | +++ |
| 516 | *** Hunks are now automatically refined by font-lock. | 520 | *** Hunks are now automatically refined by font-lock. |