diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-28 22:12:32 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-28 22:12:32 -0500 |
| commit | 659114fdba7d5ea14541cdc713c7f9745eb93c46 (patch) | |
| tree | 32cbb5f428dc239902df39d7869377b85e2338fb /lisp/emacs-lisp/checkdoc.el | |
| parent | bc68bd3998b317499fb5df713470f78fbdf3a78d (diff) | |
| download | emacs-659114fdba7d5ea14541cdc713c7f9745eb93c46.tar.gz emacs-659114fdba7d5ea14541cdc713c7f9745eb93c46.tar.bz2 emacs-659114fdba7d5ea14541cdc713c7f9745eb93c46.zip | |
Rudimentary support for vc-pull and vc-merge in Git and Mercurial.
* lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of
the other way around.
* lisp/vc/vc-git.el (vc-git-branches, vc-git-pull)
(vc-git-merge-branch): New functions.
(vc-git-history): New var.
* lisp/vc/vc-hg.el (vc-hg-history): New var.
(vc-hg-pull): Perform default pull if called via Lisp by vc-pull.
(vc-hg-merge-branch): New function.
Diffstat (limited to 'lisp/emacs-lisp/checkdoc.el')
0 files changed, 0 insertions, 0 deletions