Commit graph

1104 commits

Author SHA1 Message Date
Phil Jackson
d1070e67c7 Docs. 2010-09-20 19:46:15 +01:00
Phil Jackson
7658b557a0 Merge remote branch 'refs/remotes/sigma/master' 2010-09-18 15:07:40 +01:00
Yann Hodique
367461f0a1 Magit extensions documentation
documentation for Magit extensions

Signed-off-by: Yann Hodique <yann.hodique@gmail.com>
2010-09-18 13:57:32 +02:00
Yann Hodique
73dbc9d47d use intern' in place of make-symbol'
The important difference between the 2 is that we actually *need* the value definition, since this is where we store the actual hooks
2010-09-18 11:58:53 +02:00
Yann Hodique
8c07f36b48 incorrect hook was used to insert topgit section 2010-09-18 10:29:50 +02:00
Phil Jackson
790dd88992 Remove debugging function, docs. 2010-09-17 14:50:18 +01:00
Phil Jackson
3e91027b5d Added more man-page declarations. 2010-09-17 14:41:35 +01:00
Phil Jackson
bdaee3c8a1 Added force to push switch list. 2010-09-17 14:33:44 +01:00
Phil Jackson
82a7d9084f Added a help function. 2010-09-17 09:21:02 +01:00
Ævar Arnfjörð Bjarmason
81bb2ba2d3 magit-rebase-info: remove dead code and add >= 1.6 support
Magit's "R" feature didn't work with a Git newer than 1.6. It was only
checking for files which were removed from git.git in v1.6.0-rc0~56
[1].

1. http://github.com/git/git/commit/v1.6.0-rc0~56

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
2010-09-16 22:40:47 +01:00
Phil Jackson
08ebe7dfcd Put back the automatic merge function for branch menu.
Closes #57.
2010-09-16 22:33:29 +01:00
Phil Jackson
6541af799d Revert the log-edit bits and bobs. 2010-09-16 22:24:19 +01:00
Phil Jackson
436efe5eab Put the args themselves in parens. 2010-09-15 21:36:35 +01:00
Phil Jackson
0d84cfeb87 New opts/args. 2010-09-15 21:28:01 +01:00
Phil Jackson
62baed8c87 Optionally columnify options too. 2010-09-15 20:33:54 +01:00
Phil Jackson
a7bb2f7c8d Fix mis-calc regarding column layout. 2010-09-15 20:33:54 +01:00
Phil Jackson
fe2cbfc9bb Message to hint at what to do when presented with key menu. 2010-09-15 20:33:54 +01:00
Timo Juhani Lindfors
98848b0509 magit: [PATCH] Improve documentation of minor modes. Keymaps are now included.
Hi,

this patch improves documentation of minor modes. Notably it includes
the keymaps so that C-h m shows them depending on the mode.

From 17ac227df3428af49f4400ef27b5a05ca030bdee Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors <timo.lindfors@iki.fi>
Date: Thu, 2 Sep 2010 20:46:27 +0300
Subject: [PATCH] Improve documentation of minor modes. Keymaps are now included.
2010-09-15 13:53:56 +01:00
Phil Jackson
7058e07b9f Added Pickaxe options. 2010-09-15 13:52:10 +01:00
Timo Juhani Lindfors
1a06c8a862 Merge branch 'master' into issue-20 2010-09-14 22:36:03 +03:00
Timo Juhani Lindfors
d8c938a812 Don't use a pty with git processes that take input from magit since
that would set the terminal option icrnl which would modify the
input. In particular \r would get converted to \n (issue #20).
2010-09-14 22:33:02 +03:00
Phil Jackson
2af8e2ece0 Fixed compile warnings by adding missing defvars. 2010-09-13 21:22:42 +01:00
Phil Jackson
5a66ef18df Added key-mode.el to the Makefile. 2010-09-13 21:22:42 +01:00
Phil Jackson
4023490aca Proper author names in topgit code. 2010-09-13 16:55:30 +01:00
Phil Jackson
e39fc55fa2 Added detail about plugins to the README. 2010-09-13 16:53:31 +01:00
Phil Jackson
bc47f3fba4 Put actions at the bottom of the group buffer to indicate flow. 2010-09-13 16:48:32 +01:00
Phil Jackson
6bc6aabe0e Updated manual. 2010-09-11 17:30:14 +01:00
Phil Jackson
e4a81a5292 Better wording for the readme. 2010-09-11 15:27:58 +01:00
Phil Jackson
41aa0e46dd Remove calls of non-existent functions. 2010-09-11 15:25:27 +01:00
Phil Jackson
84b1ee5bbe Merge branch 'origin-key-groups'
Conflicts:
	Makefile.am
	README.md
	bin/mk_rel.bash
	configure.ac
	magit-svn.el
	magit.el
2010-09-11 14:49:47 +01:00
Phil Jackson
55f0a9c95b make-variable-buffer-local -> make-local-variable. 2010-09-11 14:36:30 +01:00
Phil Jackson
bd520d5540 Annotated tagging back. 2010-09-11 14:22:10 +01:00
Phil Jackson
2adf25833e Set the correct keybinding for log-edit-mode when we know the action. 2010-09-11 12:16:48 +01:00
Phil Jackson
0b953bbe94 svn plugin now key-group aware. 2010-09-11 00:59:30 +01:00
Phil Jackson
4b34f171d9 Fix up the group helper functions to handle a case where there are no current bindings. 2010-09-11 00:59:09 +01:00
Phil Jackson
70c3b4de3b Func to add a new key group. 2010-09-10 17:32:57 +01:00
Phil Jackson
8448f8a274 Dedupe the magit-key-mode-insert-* functions. 2010-09-10 17:23:20 +01:00
Phil Jackson
c9a33c6381 Docs. 2010-09-10 09:30:05 +01:00
Phil Jackson
1f36bfb7e5 Functions for plugins to add to the key groups. 2010-09-10 09:29:10 +01:00
Phil Jackson
421182233e Clear whitespace from key buffer. 2010-09-10 08:53:07 +01:00
Phil Jackson
527cc7af10 Generate interactive popup functions (thanks Rémi). 2010-09-07 21:11:03 +01:00
Phil Jackson
eba6873dc1 Move cursor to beginning of menu buffer. 2010-09-07 20:06:57 +01:00
Phil Jackson
0282351936 Added commands for running stuff. 2010-09-07 19:35:16 +01:00
Phil Jackson
536dde9f35 Put actual key bindings back in magit.el. 2010-09-05 15:42:53 +01:00
Phil Jackson
bdebdfcf8d Merged the different type of... merges. 2010-09-05 11:02:26 +01:00
Robin Green
3dd1ef3a35 Fix typo 2010-09-05 17:24:45 +08:00
Robin Green
0d67135e89 Add new file to Makefile.am 2010-09-05 17:24:45 +08:00
Chris Bernard
5299f8aa16 Add stash apply/pop "--index" option, toggled if there's a prefix arg (C-u) given to 'a' or 'A' 2010-09-04 05:08:48 +08:00
Christian Kluge
4ef20d4061 Restore GPL 2010-09-04 04:40:19 +08:00
Phil Jackson
9522698ce5 Remove redundant functions from merge command. 2010-09-03 20:17:17 +01:00