Commit graph

1076 commits

Author SHA1 Message Date
Philip Weaver
65e328c5a8 in Makefile, fix the way we set emacs load-path
When using the native Windows emacs build (not a cygwin build), but a cygwin
build of 'make', then make fails because we send unix-style paths using CURDIR
to emacs.  If instead we use (expand-file-name "."), then emacs does the magic
for us.

I looked around and found that org-mode's Makefile does exactly this.  It seems
like the right thing to do.
2010-09-29 02:40:11 -07:00
Phil Jackson
8152961d36 Added the ability to push tags. 2010-09-28 17:00:56 +01:00
Phil Jackson
8d94579f8b Make builtin completing read default again.
After a couple of requests for this.
2010-09-25 16:53:26 +01:00
Hannu Koivisto
814ba6c715 Fix magit-completing-read prompting.
Prompts are now fed to magit-completing-read in a form that makes them look
ok if magit-completing-read-function is set directly to completing-read or
a compatible function instead of a Magit-specific wrapper.
2010-09-25 11:33:40 +01:00
Phil Jackson
05f015a69b Merge branch 'master' of github.com:philjackson/magit 2010-09-24 22:23:00 +01:00
Hannu Koivisto
54745433e2 Smarter prompting for magit-rebase-step start
Use the tracked branch as the default, if available.
Don't offer the current branch as a new base.
2010-09-24 09:36:12 +01:00
Hannu Koivisto
50156dedc1 magit-read-rev: add mechanism to mask uninteresting refs 2010-09-24 09:36:12 +01:00
Hannu Koivisto
adce2cbfc3 Smarter prompting for magit-checkout
Don't offer the current branch as a choice.
2010-09-24 09:36:12 +01:00
Hannu Koivisto
c6585d534d iswitchb-based completing-read alternative for rev-reading etc. 2010-09-24 09:36:12 +01:00
Phil Jackson
96ba81887f Fix --committer option. 2010-09-23 16:45:25 +01:00
Phil Jackson
2123b72ec5 Added fetch-other and removed useless fetch option. 2010-09-22 14:55:14 +01:00
Phil Jackson
34025078c5 Remove extraneous whitespace. 2010-09-21 10:24:51 +01:00
Aaron Culich
36ace412b6 Make magit-run* look in the magit-process-buffer for a useful error
string when reporting an error, and fall back on the less helpful "Git
failed" message only if no error message could be found in the buffer.
2010-09-21 10:24:51 +01:00
Aaron Culich
17753d31fd added myself as a contributor. 2010-09-21 10:24:51 +01:00
Aaron Culich
d8d831c187 since there is no else clause, we can turn the if statement into a
when and get rid of the progn.
2010-09-21 10:24:51 +01:00
Aaron Culich
2a2a533b09 remove accidental duplicate line 2010-09-21 10:24:51 +01:00
Aaron Culich
feeb8cd46c like checkout, create-branch should also query if the user wants to
save buffers and also update the modeline when the branch has been
switched.
2010-09-21 10:24:51 +01:00
Aaron Culich
05c3e6fd10 Checkout should ask to save some buffers if magit-save-some-buffers is
non-nil. And since this functionality is now used in three places I
also created a helper function to do it.
2010-09-21 10:24:51 +01:00
Aaron Culich
4478bbb11b make checkout update modeline 2010-09-21 10:24:51 +01:00
Phil Jackson
7aafcb0acf Remove conflicting binding. 2010-09-20 19:46:16 +01:00
Phil Jackson
6465329342 Keep cursor where it was after executing a command with RET. 2010-09-20 19:46:16 +01:00
Phil Jackson
6be8e9e23b Hitting ret on actions does same as using prefix key. 2010-09-20 19:46:16 +01:00
Phil Jackson
f01829fa9a Hitting ret on switches does same as using prefix key. 2010-09-20 19:46:16 +01:00
Phil Jackson
3ebcb08091 Hitting ret on args does same as using prefix key. 2010-09-20 19:46:15 +01:00
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
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