kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Ville Skyttä	076a10c728	Be nicer if git executable is not installed This patch avoids problems if vc-git.el is installed and activated, but the git executable is not available, for example http://list-archive.xemacs.org/xemacs-beta/200608/msg00062.html Signed-off-by: Ville Skyttä <scop@xemacs.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	5df52584fa	git.el: Put the git customize group in the 'tools' parent group. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	73389f12bf	git.el: Try to reuse an existing buffer when running git-status. By default, running git-status again will now reuse an existing buffer that displays the same directory. The old behavior of always creating a new buffer can be obtained by customizing the git-reuse-status-buffer option. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	9f56a7fda9	git.el: Prepend a slash to the file name when adding to .gitignore. This way the ignore command will really only ignore the marked files and not files with the same name in subdirectories. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	51a6e56fb7	git.el: Run git-rerere on commits if the rr-cache directory exists. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Jakub Narebski	5716e794bf	Display help for Git mode after pressing `h' or `?' in git-status Add bindings for "h" and "?" in git-status-mode to display help about the mode, including keymap via (describe-function 'git-status-mode), like in PCL-CVS. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Jakub Narebski	1b3a667461	Wrap long lines in docstrings in contrib/emacs/git.el Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Ville Skytt,Ad(B	b5dd9d2027	Fix print-log and diff compatibility with recent vc versions Here's a patch that fixes print-log and diff compatibility with recent vc versions, such as current GNU Emacs CVS. Signed-off-by: Ville Skytt,Ad(B <scop@xemacs.org>	19 years ago
Jakub Narebski	e14421b9aa	Allow INSTALL, bindir, mandir to be set in main Makefile Makefiles in subdirectories now use existing value of INSTALL, bindir, mandir if it is set, allowing those to be set in main Makefile or in included config.mak. Main Makefile exports variables which it sets. Accidentally it renames bin to bindir in Documentation/Makefile (should be bindir from start, but is unused, perhaps to be removed). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	2b1c0ef2e5	git.el: Added a function to diff against the other heads in a merge. git-diff-file-merge-head generates a diff against the first merge head, or with a prefix argument against the nth head. Bound to `d h' by default. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	75a8180d4b	git.el: Get the default user name and email from the repository config. If user name or email are not set explicitly, get them from the user.name and user.email configuration values before falling back to the Emacs defaults. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	9de83169d3	git.el: More robust handling of subprocess errors when returning strings. Make sure that functions that call a git process and return a string always return nil when the subprocess failed. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Mark Wooding	8911db70f8	contrib/emacs/Makefile: Provide tool for byte-compiling files. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	a79656e6af	git.el: Added customize support for all parameters. Also fixed quoting of git-log-msg-separator. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	45033ad9e3	git.el: Added support for Signed-off-by. If `git-append-signed-off-by' is non-nil, automatically append a sign-off line to the log message when editing it. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	b23761d9ac	git.el: Automatically update .gitignore status. Update .gitignore files in the status list as they are created or modified. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	a944652c05	git.el: Set default directory before running the status mode setup hooks. Also set the list-buffers-directory variable for nicer buffer list display. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	18e3e99e3d	git.el: Portability fixes for XEmacs and Emacs CVS. Fixed octal constants for XEmacs. Added highlighting support in log-edit buffer for Emacs CVS. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	486a974acc	contrib/emacs: Add an Emacs VC backend. Add a basic Emacs VC backend. It currently supports the following commands: checkin, checkout, diff, log, revert, and annotate. There is only limited support for working with revisions other than HEAD. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Alexandre Julliard	711fc8f660	Add an Emacs interface in contrib. This is an Emacs interface for git. The user interface is modeled on pcl-cvs. It has been developed on Emacs 21 and will probably need some tweaking to work on XEmacs. The basic command is 'M-x git-status' which displays a buffer listing modified files in the selected project tree. In that buffer the following features are supported: - add/remove files - list unknown files - commit marked files - manage .gitignore - commit merges based on MERGE_HEAD - revert files to the HEAD version - resolve conflicts with smerge or ediff - diff files against HEAD/base/mine/other or combined diff - get a log of the revisions for specified files There are plenty of unimplemented features too, see the TODO list at the top of the file... Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago

21 Commits (8391548e5e78677eb81f97334d998418802ea194)