gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
853 commits 1 branch 0 tags 10 MiB
Commit graph

853 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Weizenbaum
c66c004d66 Merge branch 'master' into log-edit 2010-08-01 15:48:41 -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
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
cd9c46e226 Merge branch 'master' into log-edit 2010-06-24 17:30:52 -07:00
Nathan Weizenbaum
a6fa93b6cd Merge branch 'master' into nicer-name-rev 2010-06-24 17:30:38 -07:00
Nathan Weizenbaum
06c2902449 Merge branch 'master' into push-new-branch 2010-06-24 17:26:59 -07:00
Nathan Weizenbaum
51676dc866 Merge branch 'master' into rewrite-status-fix 2010-06-24 17:26:53 -07:00
Nathan Weizenbaum
c57f12976d Merge branch 'master' into slash-style-refs 2010-06-24 17:26:43 -07:00
Nathan Weizenbaum
0271bd562c Merge branch 'master' into update-remote-named-before-svn 2010-06-24 17:26:38 -07:00
Nathan Weizenbaum
9cc5e7e5d2 Document the new branch behavior. 2010-06-24 17:17:58 -07:00
Nathan Weizenbaum
a5b72daa02 When pushing a new branch, manually add merge configuration. 2010-06-24 16:56:18 -07:00
Nathan Weizenbaum
9b195b61e9 Properly handle pushing a branch without a remote. 
Before, this did "git push remote branch-name:nil".
Now it does "git push remote branch-name".
Git automatically sets up the remote.
 2010-06-24 16:40:28 -07:00