Commit graph

1709 commits

Author SHA1 Message Date
Aaron Culich
ecb04e7e95 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-20 20:56:26 -07:00
Aaron Culich
7cec299029 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-20 20:46:41 -07:00
Aaron Culich
dd44a02e93 make checkout update modeline 2010-09-20 20:06:31 -07: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
Gwenhael Le Moine
f13dd50d09 overridable VERSION ; Updated
Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
2010-09-17 08:42:02 +07: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
Gwenhael Le Moine
95c2843181 Merge branch 'master' of github.com:cycojesus/slackbuilds 2010-09-16 09:02:11 +07:00
Gwenhael Le Moine
9691aea6e7 Added 2010-09-16 09:00:45 +07: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
Gwenhael Le moine
462e3b86b7 Merge branch 'master' of github.com:cycojesus/slackbuilds 2010-09-15 21:29:32 +07:00
Gwenhael Le moine
dfe9906cc4 use kanis.fr version 2010-09-15 21:24:19 +07: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
Gwenhael Le Moine
bc31057457 Added 2010-09-15 16:15:17 +07:00
Gwenhael Le Moine
776c54e441 remove wanderlust, not working anyway
Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
2010-09-15 10:22:50 +07:00
Gwenhael Le Moine
f5702403b9 Added 2010-09-15 10:11:06 +07:00
Gwenhael Le Moine
5447b2af5e Added 2010-09-15 09:26:24 +07:00
Gwenhael Le Moine
7002469163 refactor 2010-09-15 09:21:28 +07: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
Gwenhael Le Moine
bf0ac7de46 add .gitignore (finally)
Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
2010-09-14 17:47:16 +07:00
Gwenhael Le Moine
c99aad652e isn't that specific to git version, VERSION=3.4.7 ./awesome.SlackBuild and let's roll!
Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
2010-09-14 17:42:35 +07: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
Gwenhael Le Moine
3becca9f78 Added 2010-09-13 16:14:04 +07: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