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

813 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Nathan Weizenbaum
1efde9202c Filter out HEAD refs from magit-name-rev. 
HEAD refs are nasty because they're highly contingent.
Branches, tags, and remotes all require some commit to be made
in order for the ref to point to a different rev,
but HEADs just need something else to be checked out.

Also, filtering out HEADs makes the name more portable.
This is useful for Magithub, where the name may be passed on to GitHub.
 2010-06-24 15:56:54 -07:00
Nathan Weizenbaum
2ea8cb2595 Add a magit-rev-parse function. 2010-06-24 15:53:20 -07:00
Moritz Bunkus
043f4383de Remove "remotes/" prefix from remote branch names 
git cannot find a branch named "remotes/repository/branch" with
most (all?) of its commands, e.g. "git branch -d -r ..." or "git
merge".
 2010-06-20 17:32:34 +01:00
Moritz Bunkus
8bcbcb369e Set 'remote branch' text property in branch view 
This only works with git versions that prefix remote branches with
"remotes/" in the output of "git branch -va". git 1.7 and 1.6.3 do,
git 1.5.6.5 does not.
 2010-06-20 17:32:34 +01:00
Phil Jackson
110e9063a3 Merge remote branch 'refs/remotes/nex3/read-rev-history' 2010-06-17 22:11:54 +01:00
Phil Jackson
1e8d4aaf0a Merge remote branch 'refs/remotes/alexott/master' 2010-06-17 12:36:55 +01:00
Alex Ott
449bebe757 get true name for directories, that specified by symlinks 2010-06-17 13:08:17 +02:00
Nathan Weizenbaum
8cc37dcb99 Fix ref ambiguity detection. 2010-06-17 01:57:28 -07:00
Nathan Weizenbaum
daa3ab8987 Remove tags/ and remotes/ in name-rev when that doesn't create ambiguity. 2010-06-17 00:10:35 -07:00
Nathan Weizenbaum
c337dcc07c Make magit-name-rev a little cleaner. 
The main thing is using --no-undefined to eliminate an extra check.
 2010-06-16 23:55:51 -07:00
Nathan Weizenbaum
8a37b3c4ab Add history for magit-read-rev. 2010-06-16 22:08:15 -07:00
Nathan Weizenbaum
7ef0b9e9cb Make magit-update-remote respect a named remote above SVN. 2010-06-16 22:06:50 -07:00
Nathan Weizenbaum
60780379f7 Make sure the status buffer is updated after a rebase. 2010-06-16 22:02:40 -07:00
Sean Bryant
5744d3ec98 Make magit explicitly tell the branch where to push. 
Closes #23.
 2010-06-16 23:06:42 +01:00
Phil Jackson
82d9943643 Stop diffless commits tricking magit into an infinite loop. 2010-06-15 13:36:16 +01:00
Phil Jackson
4ad8f773af Merge remote branch 'refs/remotes/remi/t/less-tmp-buffer' 2010-06-13 19:20:14 +01:00
Rémi Vanicat
ba0705cf9f We don't need the magit-tmp buffer to stay between its used. 
This first rename the buffer to a hidden buffer, and also remove it
after it have been used.
 2010-06-13 15:18:56 +02:00
Nathan Weizenbaum
29a1b34947 Make magit-run-git-async print out the command it's executing. 
This gives the user some immediate feedback when running a potentially long command,
such as "git fetch" or "git push".
 2010-06-11 23:15:48 +01:00
Phil Jackson
600ffa4097 Elpa compatibility. 2010-06-11 16:15:10 +01:00
Phil Jackson
cff8d04ef1 Release 0.8.1. 2010-06-10 17:35:25 +01:00
Nathan Weizenbaum
fe7656731b Add a prefix arg to magit-remote-update to prompt for a remote. 2010-06-10 13:06:51 +01:00
Phil Jackson
bcdfc155ae Merge branch 'better-checkout-in-branch-view' 2010-06-09 22:52:58 +01:00
Phil Jackson
fce3ef1fd0 User now asked for the name of a local tracking branch. Sensible default given. [R] 2010-06-09 22:50:20 +01:00
Phil Jackson
78867ac94d `magit-maybe-create-local-tracking-branch' allows for no "refs/" string. 2010-06-09 21:57:10 +01:00
Phil Jackson
97b9f4c12b Ahem, refactored authors.pl. 2010-06-09 21:53:50 +01:00
Phil Jackson
b59f493863 Remote tag back in the buffer list. 2010-06-08 11:48:48 +01:00
Phil Jackson
1dc342aad8 Added script to print authors and their copyright info, used it to fill header. 2010-06-07 23:45:39 +01:00
Phil Jackson
4f6704921f Create a bin dir, remove test dir. 2010-06-07 11:13:01 +01:00
Phil Jackson
4896e19399 Slightly modified prompt for `magit-git-command'. 2010-06-07 10:46:58 +01:00
Phil Jackson
3b31bee10c Merge remote branch 'refs/remotes/nex3/master' 2010-06-07 10:45:26 +01:00
Nathan Weizenbaum
3096eafb8a Bind : to run Git commands directly. 
I chose : as the binding for similarity with M-:.
 2010-06-06 16:13:02 -07:00
Nathan Weizenbaum
00569b85f2 Fix a bunch of checkdoc warnings. 
This only fixes the easy warnings. Harder stuff like documenting
undocumented functions or making sure all the arguments of each
function are documented is not done.
 2010-06-06 16:00:51 -07:00
Nathan Weizenbaum
448ef5cf64 Add an error message for magit-display-process. 
This message is more descriptive than the default
when Magit hasn't run a Git command.
 2010-06-06 15:59:37 -07:00
Phil Jackson
4b23df61f5 Added a little documentation to the log functions. 2010-06-01 16:46:53 +01:00
Phil Jackson
961e8c94c0 Added `magit-log-first-parent' command. 2010-06-01 16:40:21 +01:00
Phil Jackson
ba89b01730 Merge branch 'rebase-mode-fixes' 2010-05-31 22:23:07 +01:00
Phil Jackson
78800f2104 Fixed the action regexp which was too greedy. 2010-05-31 22:22:42 +01:00