Commit graph

723 commits

Author SHA1 Message Date
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
Æ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
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
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
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
527cc7af10 Generate interactive popup functions (thanks Rémi). 2010-09-07 21:11:03 +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
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
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
31387d2f50 Prefix arg allows pulling from a specified location. 2010-09-03 19:04:54 +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
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
b9ad56506c Slimmed right down the log-edit stuff. 2010-09-02 15:22:29 +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
78a3d703b0 Added -n to push menu. Added magit-custom-options to push command. 2010-09-01 23:50:25 +01:00
Phil Jackson
2e00a113d9 Added `magit-custom-options' to git-pull. 2010-09-01 23:02:19 +01:00
Phil Jackson
42fc3dac9c Remove rebase behaviour from pull. 2010-09-01 22:27:39 +01:00
Phil Jackson
ceb77d506d Added a branch menu. 2010-09-01 21:49:58 +01:00
Phil Jackson
3d1b2039ec Remove unneeded defuns. 2010-09-01 00:07:41 +01:00
Phil Jackson
6bd2a0d726 Require key-mode in magit.el. 2010-08-31 21:12:21 +01:00
Phil Jackson
602f257e7a Executing with custom options implemented. 2010-08-31 08:55:05 +01:00
Phil Jackson
4e7c19287e Moved the menu/key definitions into another file. 2010-08-30 21:23:59 +01:00
Phil Jackson
18cf118472 Updated the authors section. 2010-08-30 20:02:41 +01:00
Phil Jackson
67288d178b Merged 'master'
Conflicts:
	magit.el
2010-08-29 16:42:45 +01:00
Phil Jackson
6c8b19edd0 Merge remote branch 'refs/remotes/nex3/new-extension-api' 2010-08-20 16:15:49 +01:00
Nathan Weizenbaum
dc7dc90808 Properly quote hook names. 2010-08-17 16:50:47 -07:00
Nathan Weizenbaum
5888c37335 Major changes to the extension API.
As discussed in http://groups.google.com/group/magit/t/6a302dc5cdc05d42,
this remodels the extension API with an eye towards using existing Emacs
extension points (such as hooks and keymaps) directly, rather than
abstracting them through an additional layer.

This will also hopefully make it easier for users to do their own
customization without making a full-fledged extension.
2010-08-17 15:07:03 -07:00
Remco van 't Veer
5a960b9e9b added "i" to magit-wazzup-mode-map for magit-ignore-item 2010-08-18 03:27:09 +08:00
Leo
736d4b8f5a Fix a bug introduced in 1efde92 2010-08-17 20:22:43 +01:00
Phil Jackson
5a406c16c5 Better tramp interaction. 2010-08-17 20:20:00 +01:00
Phil Jackson
861e555983 Pull uses --rebase with prefix arg. 2010-08-09 22:58:11 +01:00
Phil Jackson
721b70c239 Bit more information in the commit buffer. 2010-08-04 10:11:28 +01:00
Phil Jackson
efe7080288 Allow annotated tags anywhere in the graph. 2010-08-03 16:35:02 +01:00
Phil Jackson
4aa4d751ff Merge remote branch 'refs/remotes/nex3/origin-default-remote' 2010-08-02 15:07:51 +01:00
Phil Jackson
d1b467c6f6 Merge remote branch 'refs/remotes/nex3/guess-branch-guesses-commits' 2010-08-02 15:03:51 +01:00
Phil Jackson
5281824586 Merge remote branch 'refs/remotes/nex3/log-edit' 2010-08-02 15:02:49 +01:00
Phil Jackson
10ef4dfe41 Merge remote branch 'refs/remotes/nex3/empty-commit' 2010-08-02 14:55:02 +01:00
Phil Jackson
48027c0f98 Merge remote branch 'refs/remotes/nex3/ignore-file' 2010-08-02 14:53:02 +01:00
Nathan Weizenbaum
6f2100c72c Merge branch 'master' into empty-commit 2010-08-01 15:48:55 -07:00
Nathan Weizenbaum
bbec69fb6e Merge branch 'master' into guess-branch-guesses-commits 2010-08-01 15:48:49 -07:00