Commit graph

1916 commits

Author SHA1 Message Date
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
Gwenhael Le moine
5b7b485f95 install READEM* in /usr/doc 2010-07-09 17:23:09 +07:00
Gwenhael Le moine
699bdf7cd5 add emacswiki link 2010-07-09 17:21:37 +07:00
Gwenhael Le moine
b02f1d154b add smex 2010-07-09 17:21:20 +07:00
Gwenhael Le moine
dc455a9ab2 provided by SlackBuild.org
Signed-off-by: Gwenhael Le moine <gwenhael.le.moine@gmail.com>
2010-07-09 08:35:51 +07:00
Gwenhael Le moine
8a5471c051 Merge branch 'master' of github.com:cycojesus/slackbuilds 2010-07-08 13:54:53 +07:00
Gwenhael Le moine
033749af3b stole chrpath from http://github.com/PhantomX/slackbuilds/tree/master/chrpath/
Signed-off-by: Gwenhael Le moine <gwenhael.le.moine@gmail.com>
2010-07-08 13:53:54 +07:00
Phil Jackson
aab7bc85f6 Merge remote branch 'refs/remotes/sigma/t/int/extensions' into extensions 2010-07-07 13:21:54 +01:00
Gwenhael Le Moine
dac32400bb updated 2010-07-07 17:58:29 +07: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
Gwenhael Le Moine
876e465a9e moved unused e/ slackbuilds
Signed-off-by: Gwenhael Le Moine <cycojesus@darkstar.(none)>
2010-07-05 13:13:59 +07:00
Gwenhael Le moine
9ed1c63b09 updated 2010-07-05 06:43:20 +07: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
Gwenhael Le Moine
a8134efaa9 add Julien Danjou Emacs libraries 2010-06-30 10:21:51 +07:00
Gwenhael Le Moine
890e0e5686 add firefox patches and stuff, straight from Slackware's official
Signed-off-by: Gwenhael Le Moine <cycojesus@darkstar.(none)>
2010-06-30 09:08:44 +07:00
Gwenhael Le Moine
fb445ce2a5 target firefox 4 2010-06-30 09:06:00 +07: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
Alan Falloon
809a5cb81c Use just the branch name for unpushed/unpulled when the remote is "."
When the remote is "." it signifies that the current branch is
tracking another local branch, not a branch in one of the remotes. So,
in that case, use just the branch name as the upstream branch instead
of the "remote/branch" naming scheme.
2010-06-30 05:21:01 +08:00
Alan Falloon
b65979510e Show branch name in "Remote:" section when tracking local branch
When the current branch is tracking a local branch (the remote is ".")
show the local upstream branch in the "Remote:" section.
2010-06-30 05:21:01 +08:00
Phil Jackson
04984e5265 Checkout works again in the branch view. 2010-06-29 22:08:14 +01:00
Phil Jackson
f74b1a560c Merge remote branch 'refs/remotes/nex3/rewrite-status-fix' 2010-06-28 21:31:36 +01:00
Phil Jackson
5aa79e249d Merge remote branch 'refs/remotes/nex3/nicer-name-rev' 2010-06-28 21:29:22 +01:00
Phil Jackson
aeb165ba3e Merge remote branch 'refs/remotes/nex3/update-remote-named-before-svn' 2010-06-28 21:24:46 +01:00
Yann Hodique
2d70b08682 minimizing extensions patch on top of upstream 2010-06-28 20:03:42 +02:00
Phil Jackson
613834919f Docstring for `magit-update-vc-modeline'. 2010-06-27 19:05:59 +01:00
Óscar Fuentes
51fffcb3a9 A better way for updating the VC modeline
Revision 51a1b6d8 introduced a change that reverts all buffers after a
commit operation for refreshing the VC modeline info. This can be slow
(because refontification, etc) and have side effects (changes on display
settings for some modes.) Instead of reverting the buffer, we now call
`vc-find-file-hook' which is much faster and have no side effects. We
now update the VC modeline info after resetting, because that operation
may change the VC status without changing the file contents (commit a
change and then reset to HEAD^, for instance.)
2010-06-27 18:47:31 +01:00
Phil Jackson
9c1a508827 Merge remote branch 'refs/remotes/nex3/push-new-branch'
Closes #25.
2010-06-27 18:43:26 +01:00
Nathan Weizenbaum
b8d6d5c08b Make sure magit-log-edit-toggle-field returns the right value. 2010-06-24 18:46:23 -07:00
Nathan Weizenbaum
5c5ba412b9 Add magit-wazzup-head and magit-wazzup-all-p variables for wazzup buffers. 2010-06-24 18:14:13 -07:00
Nathan Weizenbaum
cb5ca4ce40 Add a magit-reflog-head variable for reflog buffers. 2010-06-24 18:05:50 -07:00
Nathan Weizenbaum
abe8a031ff Add a magit-current-range variable for diff and log buffers. 2010-06-24 18:02:49 -07:00
Nathan Weizenbaum
81e2d01d03 The purpose of this branch is to expose more information about the current submode.
Currently, many submodes retain state only in magit-refresh-args.
This prevents other code from easily accessing this state.
2010-06-24 17:42:55 -07:00