Phil Jackson
cba1be0012
Put '-' in front of switch keys.
2010-08-31 12:16:23 +01:00
Phil Jackson
602f257e7a
Executing with custom options implemented.
2010-08-31 08:55:05 +01:00
Phil Jackson
5570e6ad55
Renamed key file, added kill-buffer.
2010-08-31 08:42:21 +01:00
Phil Jackson
5be31a383d
Some font-locking.
2010-08-30 23:45:51 +01:00
Phil Jackson
f6e921d431
Simple pass at drawing actions.
2010-08-30 23:28:52 +01:00
Phil Jackson
955adde578
Actions just about ready, keymap-wise.
2010-08-30 23:06:29 +01:00
Phil Jackson
b5ad1b1022
Keymap installs for mode.
2010-08-30 22:50:57 +01:00
Phil Jackson
0a2965cc2b
Experiment with a new style for the mappings.
2010-08-30 22:11:40 +01:00
Phil Jackson
4e7c19287e
Moved the menu/key definitions into another file.
2010-08-30 21:23:59 +01:00
Phil Jackson
eb0da0582e
Fix the deps for dist.
2010-08-30 20:33:52 +01:00
Phil Jackson
18cf118472
Updated the authors section.
2010-08-30 20:02:41 +01:00
Phil Jackson
4fb4e9387a
Updated the README.
2010-08-30 19:56:55 +01:00
Phil Jackson
15dfe21f59
Added a dist target.
2010-08-30 19:55:18 +01:00
Phil Jackson
821ceb25d9
Make the Makefile aware of extensions.
2010-08-30 19:12:29 +01:00
Phil Jackson
51dc5d9086
Removed unneeded files.
2010-08-30 19:11:46 +01:00
Phil Jackson
1c39796af2
Default prefix /usr/local.
2010-08-30 19:11:18 +01:00
Phil Jackson
1ad15656fa
mk_rel.bash knows about the new Makefile.
2010-08-30 19:11:13 +01:00
Phil Jackson
13f63a1fa6
Merge remote branch 'refs/remotes/lindi/simple-build-system' into simple-build-system
2010-08-30 18:12:18 +01:00
Phil Jackson
67288d178b
Merged 'master'
...
Conflicts:
magit.el
2010-08-29 16:42:45 +01:00
Timo Juhani Lindfors
fe32860471
Call build if no arguments are given to Makefile. Honor PREFIX.
2010-08-29 01:52:09 +03:00
Timo Juhani Lindfors
4db9d5b6c6
Remove magit.elc magit.info on clean
2010-08-29 01:20:08 +03:00
Timo Juhani Lindfors
2e74fbd9ef
Fix version number parsing, generate info
2010-08-29 01:18:06 +03:00
Timo Juhani Lindfors
8806d5fc94
Remove auto* files.
2010-08-29 01:11:43 +03:00
Timo Juhani Lindfors
efc97aac14
Provide simple Makefile so that auto* is not necessary.
2010-08-29 01:07:00 +03:00
Phil Jackson
5204bfa6af
localise the svn cache and use it when gathering un{pushed,pulled} commits.
2010-08-23 14:35:28 +01:00
Phil Jackson
7abbb38f5a
Correct hook names in magit-svn.el.
2010-08-23 12:03:13 +01:00
Phil Jackson
229645d1ff
Fixed some bugs in magit-svn.
2010-08-20 16:23:57 +01:00
Phil Jackson
6c8b19edd0
Merge remote branch 'refs/remotes/nex3/new-extension-api'
2010-08-20 16:15:49 +01:00
Nathan Weizenbaum
dc7dc90808
Properly quote hook names.
2010-08-17 16:50:47 -07:00
Nathan Weizenbaum
5888c37335
Major changes to the extension API.
...
As discussed in http://groups.google.com/group/magit/t/6a302dc5cdc05d42 ,
this remodels the extension API with an eye towards using existing Emacs
extension points (such as hooks and keymaps) directly, rather than
abstracting them through an additional layer.
This will also hopefully make it easier for users to do their own
customization without making a full-fledged extension.
2010-08-17 15:07:03 -07:00
Remco van 't Veer
5a960b9e9b
added "i" to magit-wazzup-mode-map for magit-ignore-item
2010-08-18 03:27:09 +08:00
Leo
736d4b8f5a
Fix a bug introduced in 1efde92
2010-08-17 20:22:43 +01:00
Phil Jackson
5a406c16c5
Better tramp interaction.
2010-08-17 20:20:00 +01:00
Phil Jackson
861e555983
Pull uses --rebase with prefix arg.
2010-08-09 22:58:11 +01:00
Phil Jackson
2af1a122e5
Merge branch 'better-annotated-tagging'
2010-08-04 10:14:59 +01:00
Phil Jackson
721b70c239
Bit more information in the commit buffer.
2010-08-04 10:11:28 +01:00
Phil Jackson
efe7080288
Allow annotated tags anywhere in the graph.
2010-08-03 16:35:02 +01:00
Phil Jackson
4aa4d751ff
Merge remote branch 'refs/remotes/nex3/origin-default-remote'
2010-08-02 15:07:51 +01:00
Phil Jackson
d1b467c6f6
Merge remote branch 'refs/remotes/nex3/guess-branch-guesses-commits'
2010-08-02 15:03:51 +01:00
Phil Jackson
5281824586
Merge remote branch 'refs/remotes/nex3/log-edit'
2010-08-02 15:02:49 +01:00
Phil Jackson
10ef4dfe41
Merge remote branch 'refs/remotes/nex3/empty-commit'
2010-08-02 14:55:02 +01:00
Phil Jackson
48027c0f98
Merge remote branch 'refs/remotes/nex3/ignore-file'
2010-08-02 14:53:02 +01:00
Phil Jackson
3ec2bd8118
Merge remote branch 'refs/remotes/nex3/more-buffer-info'
2010-08-02 14:50:49 +01:00
Nathan Weizenbaum
6f2100c72c
Merge branch 'master' into empty-commit
2010-08-01 15:48:55 -07:00
Nathan Weizenbaum
bbec69fb6e
Merge branch 'master' into guess-branch-guesses-commits
2010-08-01 15:48:49 -07:00
Nathan Weizenbaum
5e1342f359
Merge branch 'master' into ignore-file
2010-08-01 15:48:44 -07:00
Nathan Weizenbaum
c66c004d66
Merge branch 'master' into log-edit
2010-08-01 15:48:41 -07:00
Nathan Weizenbaum
f1fdbd7b83
Merge branch 'master' into more-buffer-info
2010-08-01 15:48:38 -07:00
Nathan Weizenbaum
5a2cf6b6f2
Merge branch 'master' into origin-default-remote
2010-08-01 15:48:09 -07:00
Phil Jackson
7a8ae1900e
Merge remote branch 'refs/remotes/avar/magit-stash-dash-description'
2010-07-25 16:11:39 +01:00
