Commit graph

912 commits

Author SHA1 Message Date
Christian Kluge
4ef20d4061 Restore GPL 2010-09-04 04:40:19 +08:00
Phil Jackson
9d7f9d57b6 Merge branch 'home-desktop-simple-build-system' 2010-09-03 20:16: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
Christian Kluge
1d662c5343 Typo he -> the 2010-09-01 20:39:46 +08:00
Phil Jackson
eb0da0582e Fix the deps for dist. 2010-08-30 20:33:52 +01:00
Phil Jackson
18cf118472 Updated the authors section. 2010-08-30 20:02:41 +01:00
Phil Jackson
4fb4e9387a Updated the README. 2010-08-30 19:56:55 +01:00
Phil Jackson
15dfe21f59 Added a dist target. 2010-08-30 19:55:18 +01:00
Phil Jackson
821ceb25d9 Make the Makefile aware of extensions. 2010-08-30 19:12:29 +01:00
Phil Jackson
51dc5d9086 Removed unneeded files. 2010-08-30 19:11:46 +01:00
Phil Jackson
1c39796af2 Default prefix /usr/local. 2010-08-30 19:11:18 +01:00
Phil Jackson
1ad15656fa mk_rel.bash knows about the new Makefile. 2010-08-30 19:11:13 +01:00
Phil Jackson
13f63a1fa6 Merge remote branch 'refs/remotes/lindi/simple-build-system' into simple-build-system 2010-08-30 18:12:18 +01:00
Timo Juhani Lindfors
fe32860471 Call build if no arguments are given to Makefile. Honor PREFIX. 2010-08-29 01:52:09 +03:00
Timo Juhani Lindfors
4db9d5b6c6 Remove magit.elc magit.info on clean 2010-08-29 01:20:08 +03:00
Timo Juhani Lindfors
2e74fbd9ef Fix version number parsing, generate info 2010-08-29 01:18:06 +03:00
Timo Juhani Lindfors
8806d5fc94 Remove auto* files. 2010-08-29 01:11:43 +03:00
Timo Juhani Lindfors
efc97aac14 Provide simple Makefile so that auto* is not necessary. 2010-08-29 01:07:00 +03:00
Phil Jackson
5204bfa6af localise the svn cache and use it when gathering un{pushed,pulled} commits. 2010-08-23 14:35:28 +01:00
Phil Jackson
7abbb38f5a Correct hook names in magit-svn.el. 2010-08-23 12:03:13 +01:00
Phil Jackson
229645d1ff Fixed some bugs in magit-svn. 2010-08-20 16:23:57 +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
2af1a122e5 Merge branch 'better-annotated-tagging' 2010-08-04 10:14:59 +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
Phil Jackson
3ec2bd8118 Merge remote branch 'refs/remotes/nex3/more-buffer-info' 2010-08-02 14:50:49 +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
Nathan Weizenbaum
5e1342f359 Merge branch 'master' into ignore-file 2010-08-01 15:48:44 -07:00
Nathan Weizenbaum
c66c004d66 Merge branch 'master' into log-edit 2010-08-01 15:48:41 -07:00
Nathan Weizenbaum
f1fdbd7b83 Merge branch 'master' into more-buffer-info 2010-08-01 15:48:38 -07:00
Nathan Weizenbaum
5a2cf6b6f2 Merge branch 'master' into origin-default-remote 2010-08-01 15:48:09 -07:00
Phil Jackson
7a8ae1900e Merge remote branch 'refs/remotes/avar/magit-stash-dash-description' 2010-07-25 16:11:39 +01:00
Ævar Arnfjörð Bjarmason
6a5fbcee8d magit-stash: Prefix user-supplied description with --
Fixes a bug in magit-stash that prevented magit from creating stashes
that began with "-", since git-stash parse them as options.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
2010-07-25 15:08:36 +00:00
Phil Jackson
d93048fb94 Merge branch 'extensions'
Conflicts:
	magit.el
2010-07-11 20:47:19 +01:00
Phil Jackson
761d6ad09b Build system updated. 2010-07-11 18:54:03 +01:00
Phil Jackson
07dbd67495 Removed wanderlust again. 2010-07-11 18:53:49 +01:00
Phil Jackson
8be54f6757 Release 0.8.2. 2010-07-10 12:41:05 +01:00