org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	git.el: Added a function to diff against the other heads in a merge.	Alexandre Julliard	2006-03-19
\| \| \| \| \| \| \| \| \|	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>
*	git.el: Get the default user name and email from the repository config.	Alexandre Julliard	2006-03-19
\| \| \| \| \| \| \| \| \|	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>
*	git.el: More robust handling of subprocess errors when returning strings.	Alexandre Julliard	2006-03-19
\| \| \| \| \| \| \| \|	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>
*	git.el: Added customize support for all parameters.	Alexandre Julliard	2006-03-04
\| \| \| \| \| \| \|	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>
*	git.el: Added support for Signed-off-by.	Alexandre Julliard	2006-03-04
\| \| \| \| \| \| \| \|	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>
*	git.el: Automatically update .gitignore status.	Alexandre Julliard	2006-03-04
\| \| \| \| \| \| \| \|	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>
*	git.el: Set default directory before running the status mode setup hooks.	Alexandre Julliard	2006-03-04
\| \| \| \| \| \| \| \|	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>
*	git.el: Portability fixes for XEmacs and Emacs CVS.	Alexandre Julliard	2006-03-04
\| \| \| \| \| \| \| \|	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>
*	Add an Emacs interface in contrib.	Alexandre Julliard	2006-02-18
	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>