kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
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

11 Commits (475443c8489d9167b944367d8ec8bfef77bee0a5)