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
Ævar Arnfjörð Bjarmason
6a5fbcee8d
magit-stash: Prefix user-supplied description with --
...
Fixes a bug in magit-stash that prevented magit from creating stashes
that began with "-", since git-stash parse them as options.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
2010-07-25 15:08:36 +00:00
Phil Jackson
d93048fb94
Merge branch 'extensions'
...
Conflicts:
magit.el
2010-07-11 20:47:19 +01:00
Phil Jackson
761d6ad09b
Build system updated.
2010-07-11 18:54:03 +01:00
Phil Jackson
07dbd67495
Removed wanderlust again.
2010-07-11 18:53:49 +01:00
Phil Jackson
8be54f6757
Release 0.8.2.
2010-07-10 12:41:05 +01:00
Phil Jackson
1a9ae85faa
Formatting.
2010-07-10 11:41:12 +01:00
Rémi Vanicat
b3beac42cb
Handle 7 and 8 char small sha
...
Otherwise this lead to an error in branch view mode.
2010-07-10 11:40:45 +01:00
Phil Jackson
3153f777d1
Add magit-wanderlust.el.
2010-07-10 11:39:50 +01:00
Phil Jackson
aab7bc85f6
Merge remote branch 'refs/remotes/sigma/t/int/extensions' into extensions
2010-07-07 13:21:54 +01:00
Yann Hodique
71f76c9053
Merge branch 't/upstream/extensions' into t/int/extensions
...
- fix dep to topgit in core
- remove 'cl runtime dependency
2010-07-06 21:16:21 +02:00
Phil Jackson
64756e9940
Update manual with regards to the svn change.
2010-07-06 11:03:18 +01:00
Phil Jackson
fd2fd4725c
Make git svn fetch an explicit command rather than overriding remote-fetch.
2010-07-06 11:01:12 +01:00
Phil Jackson
bf14e965ba
Actual branch name in remote string.
2010-07-06 00:19:23 +01:00
Phil Jackson
6599b6ac57
Use remote branch for unpushed ref.
2010-07-06 00:10:50 +01:00
Phil Jackson
9e45718491
Formatting.
2010-07-06 00:07:37 +01:00
Phil Jackson
f569ff8359
Fix `magit-refresh-status'.
2010-07-06 00:02:51 +01:00
Phil Jackson
67af1eead8
Stop `magit-remote-string' expecting the svn-info cache.
2010-07-05 23:54:23 +01:00
Phil Jackson
e58b3c379c
Added `magit-remote-branch-name'. Fixed unpushed args.
2010-07-05 23:53:37 +01:00
Phil Jackson
82883d1de3
Removed old insert functions.
2010-07-05 23:32:29 +01:00
Phil Jackson
7eb66a4310
Merge remote branch 'refs/remotes/sigma/t/int/extensions' into extensions
...
Conflicts:
magit.el
2010-07-05 23:24:16 +01:00
Ævar Arnfjörð Bjarmason
997ecb4e10
magit-remote-ref-format: Improved documentation
2010-07-03 01:26:55 +08:00
Phil Jackson
f5ba22f966
Merge branch 'master' of https://github.com/philjackson/magit
2010-07-01 09:54:06 +01:00
Leo
d4dd5c5da0
Don't run magit-log-edit-mode-hook twice.
2010-07-01 09:52:00 +01:00
Phil Jackson
bdba20d5cc
Fixed the ref/rev typo.
2010-06-30 15:55:01 +01:00
Phil Jackson
c505ef6faf
Merge remote branch 'remotes/nex3/slash-style-refs'
2010-06-29 23:12:11 +01:00
Phil Jackson
dc49fde45e
Replace slashes in tracking branch name suggestion.
2010-06-29 23:09:05 +01:00
Phil Jackson
fd6f6d5ea7
Manual entry for new branch mode binding.
2010-06-29 22:55:40 +01:00
Phil Jackson
42a70d14cc
RET checks out a branch in the branch view.
2010-06-29 22:53:09 +01:00
Phil Jackson
bd01310032
Merge branch 'github-merge-requests'
2010-06-29 22:34:24 +01:00
