Phil Jackson
536dde9f35
Put actual key bindings back in magit.el.
2010-09-05 15:42:53 +01:00
Phil Jackson
bdebdfcf8d
Merged the different type of... merges.
2010-09-05 11:02:26 +01:00
Phil Jackson
9522698ce5
Remove redundant functions from merge command.
2010-09-03 20:17:17 +01:00
Phil Jackson
31387d2f50
Prefix arg allows pulling from a specified location.
2010-09-03 19:04:54 +01:00
Phil Jackson
22186b0636
Fix create-branch.
2010-09-02 16:20:03 +01:00
Phil Jackson
21fb0a9ea3
Formatting.
2010-09-02 16:09:07 +01:00
Phil Jackson
b9ad56506c
Slimmed right down the log-edit stuff.
2010-09-02 15:22:29 +01:00
Phil Jackson
f4b5a8cb8f
Docs.
2010-09-02 00:10:05 +01:00
Phil Jackson
548b2e567f
Separation of fetch and remote update.
2010-09-02 00:00:42 +01:00
Phil Jackson
78a3d703b0
Added -n to push menu. Added magit-custom-options to push command.
2010-09-01 23:50:25 +01:00
Phil Jackson
2e00a113d9
Added `magit-custom-options' to git-pull.
2010-09-01 23:02:19 +01:00
Phil Jackson
42fc3dac9c
Remove rebase behaviour from pull.
2010-09-01 22:27:39 +01:00
Phil Jackson
ceb77d506d
Added a branch menu.
2010-09-01 21:49:58 +01:00
Phil Jackson
3d1b2039ec
Remove unneeded defuns.
2010-09-01 00:07:41 +01:00
Phil Jackson
6bd2a0d726
Require key-mode in magit.el.
2010-08-31 21:12:21 +01:00
Phil Jackson
602f257e7a
Executing with custom options implemented.
2010-08-31 08:55:05 +01:00
Phil Jackson
4e7c19287e
Moved the menu/key definitions into another file.
2010-08-30 21:23:59 +01:00
Phil Jackson
67288d178b
Merged 'master'
...
Conflicts:
magit.el
2010-08-29 16:42:45 +01:00
Oscar Fuentes
cb49072477
Fixed magit-move-branch
2010-05-24 04:35:29 +02:00
Oscar Fuentes
2d115df020
Displays the option name instead of the description
2010-05-19 18:10:31 +02:00
Oscar Fuentes
7e8819dbf2
Use all available columns on window for displaying menu items
2010-05-19 03:39:34 +02:00
Oscar Fuentes
fc62c664fd
Highlight active options on menu.
2010-05-18 21:52:01 +02:00
Oscar Fuentes
ad5829a2f4
Fixed usage of magit-custom-options on some commands
...
It is not good to have magit-custom-options when it is nil into the
middle of the list of arguments.
2010-05-18 19:50:19 +02:00
Oscar Fuentes
57fa9eb0fd
Corrected docstring of magit-custom-options
2010-05-18 19:25:23 +02:00
Oscar Fuentes
029bf08ea8
Append colon and space to the end of prompt
2010-05-18 19:09:08 +02:00
Oscar Fuentes
92c0b771ed
Removed some keybindings and collapsed some menu entries
2010-05-18 19:06:45 +02:00
Oscar Fuentes
ae4e4c5ac2
Added some log options, just for fun. Removed log-grep command
2010-05-18 18:30:23 +02:00
Oscar Fuentes
da70669be0
Do not use use shell-quote-argument for options picked on the menu
...
This upsets msys-git and it is not needed anymore because git is not
invoked through the shell.
2010-05-18 18:28:48 +02:00
oscar
bf7bc1a0c5
magit-menu-make-option-list rewritten
...
The previous implementation generated a single list element for
arguments of the type --arg value. That should be separate list
elements, otherwise the process sees it as a single argument with an
embedded space.
2010-05-18 03:56:45 +02:00
oscar
b2c0fcb7b8
Several branch-related commands and options
2010-05-17 21:43:57 +02:00
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
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
0a9bf3005a
New function `magit-log-all' which provides --all functionality.
2010-05-14 11:57:07 +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
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
cb458d5918
Acknowledge David Abrahams.
2010-05-06 19:38:40 +01:00