Commit graph

1034 commits

Author SHA1 Message Date
oscar
9c63409cc1 Filters commands and options by group 2010-05-17 21:43:20 +02:00
oscar
fe1f6016f0 Code moved to a place where it makes more sense
Also magit-submenu was renamed to magit-menu.
2010-05-17 20:20:39 +02:00
Ævar Arnfjörð Bjarmason
9240447417 Add bit about history + Marius + Philip back in
On request of Philip Jackson in
<87aaryio1g.wl%phil@shellarchive.co.uk>.
2010-05-18 00:17:30 +08:00
Ævar Arnfjörð Bjarmason
1470f05cff Not "and" at the beginning of a sentence + better sh example
Remove the $ so that it's possible to copy/paste this directly to a
shell.
2010-05-18 00:17:30 +08:00
Ævar Arnfjörð Bjarmason
ed6d791c61 Make magit's README file better
* Rewrite the intro, the old one wasn't really applicable anymore.

  * Use Markdown to its fullest, the old links were really confusing.

  * More links, link prominently to the manual, screencast and
    cheatsheet.
2010-05-18 00:17:30 +08:00
Ævar Arnfjörð Bjarmason
35dfceb3b5 Add a hook for magit-log-edit-mode 2010-05-17 22:51:08 +08:00
Ævar Arnfjörð Bjarmason
50ac04d222 Give magit-mode-hook a docstring 2010-05-17 22:51:08 +08:00
Ævar Arnfjörð Bjarmason
d2d1bd87fd Say "New annotated tag name" not "New tag name" on T
This distinguishes t from T. Sometimes you press one and aren't sure
if you got it right.
2010-05-17 22:49:55 +08:00
oscar
626af3b9c1 Fix showing help
Now it exits after showing the help window because the user can't
interact with it while the menu is working and on some cases the help
buffer uses the same window as the menu, hidding it.
2010-05-16 20:18:31 +02:00
oscar
903e642bf6 Pass options to log commands 2010-05-16 20:10:03 +02:00
oscar
abc459911b Removed extra parentheses 2010-05-16 19:12:03 +02:00
oscar
2f9c9b99fb Do not require the -option suffix for menu items 2010-05-16 18:43:33 +02:00
oscar
46592b4dcd Display and input options 2010-05-16 18:36:10 +02:00
oscar
b7964bb4b4 Added some log commands 2010-05-16 16:32:11 +02:00
oscar
f028c76330 Key for showing the docstring of the associated function 2010-05-16 04:34:38 +02:00
oscar
0f03b076e7 Show two menu entries per line 2010-05-16 02:11:17 +02:00
oscar
9cd7d57ed1 Removed some debug code 2010-05-16 01:15:34 +02:00
oscar
c40dfe75e5 Pass prefix argument to command 2010-05-16 01:14:34 +02:00
oscar
09f09afd34 Works without supporting prefixes 2010-05-15 20:02:40 +02:00
Phil Jackson
aa33f2f6a7 Merge branch 'log--all' 2010-05-15 12:09:12 +01:00
Phil Jackson
0a9bf3005a New function `magit-log-all' which provides --all functionality. 2010-05-14 11:57:07 +01:00
Phil Jackson
2a49110041 Updated the README with homepage information. 2010-05-13 18:12:22 +01:00
Rémi Vanicat
0c1f170e44 Use magit-git-output instead of magit-git-string in magit-interactive-resolve
closes #1: magit-git-string was responsible for trimming the last \n
2010-05-13 19:07:26 +08:00
Phil Jackson
11c14b6357 Put back magit-list-buffers' and magit-list-projects' as they might come in handy to others. 2010-05-12 23:34:04 +01:00
Phil Jackson
75941be63b Gave `magit-log-grep' a key binding (s - search). 2010-05-11 10:06:33 +01:00
Phil Jackson
6c8947a131 Missed a possible graph shape in log re. 2010-05-11 10:03:38 +01:00
Rémi Vanicat
12a4e8cbdb Add encoding declaration to magit.texi
When generating html file, makeinfo need this information to put the
correct charset.
2010-05-09 17:49:59 +01:00
Rémi Vanicat
33998d4b0c Use markdown for all of the links. 2010-05-08 10:41:38 +01:00
Phil Jackson
0ff29fe5c6 Added a link to the downloads in the README. 2010-05-07 22:10:54 +01:00
Phil Jackson
2208162840 Added mk_rel.bash to help.. mk rels. 2010-05-07 21:52:59 +01:00
Phil Jackson
387969a873 Link to README to keep automake happy. 2010-05-07 21:32:14 +01:00
Phil Jackson
ea7437137d Revert "Merge branch 'am-from-wl'"
This reverts commit 1b31c106f8.
Reverting "Added `magit-wl-pipe-to-am'."
Reverting "Replace cl functions."
Reverting "`magit-list-projects' returns full path."
Reverting "Added `magit-list-projects."
Reverting "Added `magit-list-buffers'."
2010-05-07 21:28:53 +01:00
Phil Jackson
d74beb91ee Markdown'd the README. 2010-05-07 21:00:49 +01:00
Phil Jackson
cb458d5918 Acknowledge David Abrahams. 2010-05-06 19:38:40 +01:00
Phil Jackson
dbbf2cf669 Merge branch 'am-from-wl' 2010-05-06 19:32:07 +01:00
Phil Jackson
effbbb3b13 Added `magit-wl-pipe-to-am'. 2010-05-06 19:26:51 +01:00
Phil Jackson
326fff2823 Replace cl functions. 2010-05-06 19:26:34 +01:00
Phil Jackson
f2817e7c78 `magit-list-projects' returns full path. 2010-05-06 18:18:02 +01:00
Phil Jackson
0ca04f71bb Added `magit-list-projects. 2010-05-06 17:57:08 +01:00
Phil Jackson
1b31c106f8 Added `magit-list-buffers'. 2010-05-06 17:56:59 +01:00
Phil Jackson
5c206c4bf4 Mention 'e' being the new 'l' in log view. 2010-05-06 12:38:59 +01:00
Ramkumar Ramachandra
f8e429e8de Add an option to confirm reverting an item. 2010-05-06 12:33:11 +01:00
David Abrahams
abba1a02e2 Have files saved when finished a three-way-merge with ediff. 2010-05-06 11:21:27 +01:00
Rémi Vanicat
c50fab4242 Added a compatibility function for start-file-process as it does not exist
in Emacs 22.
2010-05-06 00:48:36 +01:00
Moritz Bunkus
d4aa3ff85a Only call server-running-p on Emacs 23 or newer 2010-05-06 00:31:24 +01:00
Phil Jackson
8bf8a36db6 Use `magit-section-case' to get branch from wazzup. 2010-05-06 00:27:20 +01:00
Rémi Vanicat
179f1b9809 Use guess-branch and default-rev wherever we ask for a branch or a rev.
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-05-06 00:07:42 +01:00
Rémi Vanicat
b6d7f36a7d When there is a guessed branch, it make a good default rev.
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-05-06 00:06:11 +01:00
Óscar Fuentes
51a1b6d84c Revert buffers after committing
I find the VC status on the modeline useful (the one that shows
Git[:-]branchname) This indicates when the buffer's associated file was
changed on disk (`:' for edited, `-' for unedited.) This indicator is
not affected by a commit with magit, so it keeps signaling a file as
edited when in fact it is not. This patch reverts all buffers that are
visiting a file in the current working tree after a commit.
2010-05-05 16:36:36 +01:00
Óscar Fuentes
5f371df069 Correct informative text for showing more log entries
At the end of the log, the text ``type "l" to show more logs'' is
shown. The actual keybinding is `e', not `l'.
2010-05-05 16:31:56 +01:00