]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bc68bd3) | patch
Rudimentary support for vc-pull and vc-merge in Git and Mercurial.
authorChong Yidong <cyd@stupidchicken.com>
Sat, 29 Jan 2011 03:12:32 +0000 (22:12 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 29 Jan 2011 03:12:32 +0000 (22:12 -0500)
commit659114fdba7d5ea14541cdc713c7f9745eb93c46
tree32cbb5f428dc239902df39d7869377b85e2338fbtree | snapshot
parentbc68bd3998b317499fb5df713470f78fbdf3a78dcommit | diff
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.
etc/NEWS diff | blob | history
lisp/ChangeLog diff | blob | history
lisp/vc/vc-dispatcher.el diff | blob | history
lisp/vc/vc-git.el diff | blob | history
lisp/vc/vc-hg.el diff | blob | history
lisp/vc/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.