Commit graph

1684 commits

Author SHA1 Message Date
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
Gwenhael Le Moine
021ae33404 updated for 1.1 2010-09-21 17:22:06 +07: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
Gwenhael Le Moine
a577c5ec00 Added 2010-09-21 16:08:50 +07:00
Gwenhael Le Moine
ee888c3f6a removed zenburn.el link 2010-09-21 14:13:37 +07:00
Gwenhael Le Moine
f6cc843dd4 Added 2010-09-21 14:12:42 +07:00
Aaron Culich
8cd4331894 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-20 22:01:28 -07:00
Aaron Culich
5629766d48 added myself as a contributor. 2010-09-20 21:12:05 -07:00
Aaron Culich
504645ac1a since there is no else clause, we can turn the if statement into a
when and get rid of the progn.
2010-09-20 21:03:59 -07:00
Aaron Culich
a3d4529e23 remove accidental duplicate line 2010-09-20 21:02:12 -07:00
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