emacs: .gitignore annotate

annotate .gitignore @ 111679:33ed3cf8260b

Initial support for unified DVCS pull and merge. * lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars. (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull) (vc-bzr-merge-branch): New functions, implementing merge-branch and pull operations. * lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available. Accept optional prefix arg meaning to prompt for a command. (vc-update): Use vc-BACKEND-pull if available. Accept optional prefix arg meaning to prompt for a command. (vc-pull): Alias for vc-update.

author	Chong Yidong <cyd@stupidchicken.com>
date	Mon, 22 Nov 2010 20:15:08 -0500
parents	6719c75fa3ac
children

rev	line source
102379 9785b99a1354 Add .gitignore Miles Bader <miles@gnu.org> parents: diff changeset	1 autom4te.cache
102380 762408a9ef5d Add .gitignore rules for in-place builds. Juanma Barranquero <lekktu@gmail.com> parents: 102379 diff changeset	2 makefile
104669 9a2d92bd2a3e Ignore all backup files. Andreas Schwab <schwab@linux-m68k.org> parents: 102380 diff changeset	3 *~
109508 6719c75fa3ac * .bzrignore, .gitignore: Ignore README.W32 on the root directory. Juanma Barranquero <lekktu@gmail.com> parents: 104669 diff changeset	4 /README.W32
102380 762408a9ef5d Add .gitignore rules for in-place builds. Juanma Barranquero <lekktu@gmail.com> parents: 102379 diff changeset	5
762408a9ef5d Add .gitignore rules for in-place builds. Juanma Barranquero <lekktu@gmail.com> parents: 102379 diff changeset	6 /bin/
762408a9ef5d Add .gitignore rules for in-place builds. Juanma Barranquero <lekktu@gmail.com> parents: 102379 diff changeset	7 /site-lisp/
102379 9785b99a1354 Add .gitignore Miles Bader <miles@gnu.org> parents: diff changeset	8
9785b99a1354 Add .gitignore Miles Bader <miles@gnu.org> parents: diff changeset	9 # arch-tag: 75cd3c50-1875-4814-8360-190f7de38302

Mercurial > emacs

annotate .gitignore @ 111679:33ed3cf8260b