Commit graph

1035 commits

Author SHA1 Message Date
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
Phil Jackson
9d7f9d57b6 Merge branch 'home-desktop-simple-build-system' 2010-09-03 20:16:37 +01:00
Phil Jackson
cb20289fc9 Removed superfluous debugging. 2010-09-03 20:14:59 +01:00
Phil Jackson
31387d2f50 Prefix arg allows pulling from a specified location. 2010-09-03 19:04:54 +01:00
Phil Jackson
2733adb8b6 Added a stash menu. 2010-09-03 18:50:39 +01:00
Phil Jackson
653cc89684 Added a merge menu. 2010-09-03 18:34:37 +01:00
Timo Juhani Lindfors
fc01cd5936 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-02 19:01:24 +01:00
Timo Juhani Lindfors
c430cfd093 magit: [PATCH] Make face of the graph of log output lighter on dark backgrounds.
Hi,

with

xterm -bg black -fg white

the graph shown with M-x magit-log RET can not be seen. Since the
color is so dark I guess emacs ends up using black text on black
background.

The attached patch makes the color a little bit lighter so that it is
visible. I tested this for regressions on X and non-X setups with
several different background colors.

From 687e12d8124351f99bb844a5310f347ee2602aa1 Mon Sep 17 00:00:00 2001
From: Timo Juhani Lindfors <timo.lindfors@iki.fi>
Date: Thu, 2 Sep 2010 16:17:18 +0300
Subject: [PATCH] Make face of the graph of log output lighter on dark backgrounds.

This has been tested in the following configurations:

1) xterm -bg black -fg white
2) xterm -bg white -fg black
3) xterm -bg grey -fg black
4) emacs
5) emass -rv
2010-09-02 19:01:18 +01:00
Phil Jackson
ee84d43a18 Require assoc. 2010-09-02 18:22:13 +01:00
Phil Jackson
22186b0636 Fix create-branch. 2010-09-02 16:20:03 +01:00
Phil Jackson
21fb0a9ea3 Formatting. 2010-09-02 16:09:07 +01:00
Phil Jackson
08181fde85 A couple more options for committing. 2010-09-02 15:37:53 +01:00
Phil Jackson
b9ad56506c Slimmed right down the log-edit stuff. 2010-09-02 15:22:29 +01:00
Phil Jackson
03c5dec5b6 Formatting. 2010-09-02 00:10:20 +01:00
Phil Jackson
f4b5a8cb8f Docs. 2010-09-02 00:10:05 +01:00
Phil Jackson
548b2e567f Separation of fetch and remote update. 2010-09-02 00:00:42 +01:00
Phil Jackson
a3f38d4111 Docs. 2010-09-01 23:53:23 +01:00
Phil Jackson
78a3d703b0 Added -n to push menu. Added magit-custom-options to push command. 2010-09-01 23:50:25 +01:00
Phil Jackson
564726a247 Use `window-width' to wrap menu items. 2010-09-01 23:43:57 +01:00
Phil Jackson
2e00a113d9 Added `magit-custom-options' to git-pull. 2010-09-01 23:02:19 +01:00