Gwenhael Le moine
0c39ecc831
add to satisfy bitbake/OE
2010-03-22 22:47:08 +07:00
Gwenhael Le Moine
5f457194d9
add bzr pull (don't ask)
2010-03-22 15:09:24 +07:00
Gwenhael Le Moine
b98ae812f5
add xap/zathura, a PDF viewer
2010-03-22 15:06:50 +07:00
Phil Jackson
0fc398039d
Merge commit 'refs/merge-requests/11' of git://gitorious.org/magit/mainline
2010-03-20 16:24:05 +00:00
Phil Jackson
5dc924748a
Merge commit 'refs/merge-requests/14' of git://gitorious.org/magit/mainline
2010-03-20 16:22:37 +00:00
Rémi Vanicat
bb74ce61af
Show the graph in wazzup.
2010-03-20 13:33:31 +01:00
Rémi Vanicat
8c16b10141
Use view-mode for the *magit-process* buffer
...
Now, q will bury the buffer, and several other keybindig will be
available
2010-03-20 13:16:58 +01:00
Rémi Vanicat
ed0ad8eff7
use --pretty=format: * %H %s where needed
...
The current magit-wash-log is made for commit with graph, so we must at least use
--pretty=format: * %H %s or the --graph for it to work as expected.
2010-03-20 13:14:21 +01:00
Gwenhael Le Moine
044465dd21
tried to make it work with git master..., failed
2010-03-19 14:39:27 +07:00
Gwenhael Le Moine
4ea0388b58
got it working \o/
2010-03-19 13:28:31 +07:00
Gwenhael Le Moine
37501795e5
add doc/perl6-book (WIP)
...
Signed-off-by: Gwenhael Le Moine <cycojesus@darkstar.(none)>
2010-03-19 12:59:05 +07:00
Hannu Koivisto
ea0812f119
Add command magit-reset-head-hard.
...
Intended to be bound to X instead of magit-reset-working-tree for those who
feel it is a more consistent pair for x. Suggests HEAD and therefore works
like magit-reset-working-tree by default. Eliminates need to use C-u x.
2010-03-18 23:25:58 +02:00
Hannu Koivisto
8020b0396a
Add command magit-toggle-file-section.
...
For those who never want to toggle at hunk granularity.
2010-03-18 23:25:58 +02:00
Hannu Koivisto
94ca78a86f
Add command magit-goto-parent-section.
2010-03-18 23:25:58 +02:00
Hannu Koivisto
6a1bb4f644
Fix magit-get-top-dir from ruining paths with symlinks.
...
One might argue that this also makes it work better in a case when GIT_DIR
points outside of a work tree, but because in that case any directory is a
valid "top dir" from GIT's point of view, that is debatable. But at least
one can use Magit in that case by first making sure that default-directory
is the top dir and then executing magit-status.
2010-03-18 23:25:58 +02:00
Hannu Koivisto
01d58d4385
Fix magit-log-edit-mode keymap definition and activation.
...
Rely on the standard define-derived-mode functionality.
2010-03-18 23:25:58 +02:00
Gwenhael Le Moine
30892b9039
add link to sml-modeline.el
2010-03-18 16:07:30 +07:00
Gwenhael Le Moine
4b8fc96c44
add the "Ruby best practices" book
2010-03-18 10:51:09 +07:00
Gwenhael Le moine
f1679db694
add rainbow-parens
2010-03-16 22:28:17 +07:00
Gwenhael Le moine
ea3937198d
add paredit
2010-03-16 22:25:28 +07:00
Gwenhael Le moine
99f97bd890
add minimap (gorgeous!)
2010-03-16 22:18:34 +07:00
Phil Jackson
42c63c3a10
Merge remote branch 'refs/remotes/AlexeyVoinov/git-stash-fixes'
2010-03-16 13:42:53 +00:00
Phil Jackson
0074a3185c
Merge branch 'fancy-log-output'.
2010-03-16 13:34:44 +00:00
Alexey Voinov
6e9e517e6f
Use sha1 to differetiate between stashes, not stash number
2010-03-16 16:18:16 +03:00
Alexey Voinov
f754864373
Don't show empty *magit-stash* buffer.
2010-03-16 15:48:54 +03:00
Alexey Voinov
7dad3be958
Show the right buffer when showing stash
2010-03-16 15:48:54 +03:00
Gwenhael Le moine
bcec83b6e7
Merge branch 'master' of github.com:cycojesus/slackbuilds
2010-03-16 19:06:54 +07:00
Gwenhael Le moine
6620337c9f
add e/emacs-w3m
2010-03-16 18:56:36 +07:00
Gwenhael Le moine
5abe928075
stolen and updated from SBo (12.2)
2010-03-16 08:57:17 +07:00
Gwenhael Le moine
9b28c09cb9
bzr's weird (or I'm thick)
2010-03-15 18:08:07 +07:00
Gwenhael Le moine
54160d1a00
txz
2010-03-15 17:58:35 +07:00
Gwenhael Le moine
efdceba1b4
stolen and updated from SBo (12.2)
2010-03-15 17:55:43 +07:00
Gwenhael Le moine
83aa8f5ff4
auto-download
2010-03-15 17:48:08 +07:00
Gwenhael Le moine
8e1f0ae295
stolen and updated, from SBo (12.2)
2010-03-15 17:46:52 +07:00
Phil Jackson
bf42bf872a
Merge branch 'fancy-log-output'.
2010-03-14 14:52:57 +00:00
Phil Jackson
6f9993cbd4
Remove 'HEAD' from ref list.
2010-03-14 14:46:56 +00:00
Phil Jackson
a4cbd5ecd3
Refs matching was too greedy and causing some logs not to render.
2010-03-14 14:45:50 +00:00
Phil Jackson
d43a23b48f
Merge remote branch 'refs/remotes/philjackson/fancy-log-pt1'
...
Conflicts:
magit.el
2010-03-14 14:42:50 +00:00
Alexey Voinov
37731ad567
Replaced call-process-region with start-file-process and wait.
...
call-process-region doesn't work with remote tramp
directories. Staging of diff hunks was broken.
2010-03-12 17:43:18 +00:00
Rémi Vanicat
a291507171
In magit-ignore-file, add a new line if there wasn't one in the ignore file
2010-03-12 18:11:14 +01:00
Alexey Voinov
7ca25460fa
emulate append-to-file, because it doesn't work over tramp
2010-03-12 18:11:14 +01:00
Pavel Holejsovsky
3d2321b317
Make async git invocation work on cygwin.
...
Forces emacs to use pipes for communication with git subprocess.
Although default PTY method should work too, there is probably
something broken in cygwin causing that resulting process never
receives any input and hangs forever.
In any case, setting communication to 'pipe' is recommended by
start-process docs anyway for background processes, as it is usually
faster and more efficient.
2010-03-11 14:12:30 +01:00
Phil Jackson
db53f15cb5
Merge remote branch 'refs/remotes/AlexeyVoinov/git-svn-fixes'
2010-03-11 11:18:30 +00:00
Alexey Voinov
4e59fade68
Fixed svn-ref-info for most non-standard layouts
2010-03-11 13:32:28 +03:00
Alexey Voinov
f65dfce86e
magit-get-all is wrapper for git config --get-all
2010-03-11 13:20:41 +03:00
Phil Jackson
dddfe3035e
Highlight only the diff markers (not the text after them).
2010-03-10 21:43:11 +00:00
Phil Jackson
f7f383bf1a
Removed redundant call from `magit-get-svn-ref-info'.
2010-03-10 21:38:56 +00:00
Phil Jackson
9325431ad4
Added `magit-omit-untracked-dir-contents' to optionally stop magit listing everything in an untracked directory.
2010-03-10 21:38:04 +00:00
Phil Jackson
282303265f
Merge remote branch 'refs/remotes/philjackson/git-svn-fixes-and-features'
2010-03-10 21:29:42 +00:00
Phil Jackson
10f88917ca
Bug fix: Commit buffer will fill if the commit is current and the buffer dead.
2010-03-10 21:21:33 +00:00
