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

796 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Weizenbaum
cd9c46e226 Merge branch 'master' into log-edit 2010-06-24 17:30:52 -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
8a37b3c4ab Add history for magit-read-rev. 2010-06-16 22:08:15 -07:00
Nathan Weizenbaum
f0c05ea93d Don't add info to the edit log when a commit is successfully applied. 
Previously, if a commit was successfully applied and committed,
its information was still added to the edit log. This wasn't useful.
Now the information is only added if the commit wasn't committed (e.g. with a)
or if it was committed (with A) but the commit failed.
 2010-06-16 22:03:26 -07:00
Nathan Weizenbaum
6e0de30947 Make sure magit-log-edit-set-fields works properly when there are no headers. 
Before, if there were no headers but there was a header line,
an extra header line was added.
 2010-06-16 22:03:24 -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
Phil Jackson
f4ef288e77 Repopulate `auto-mode-alist'. 2010-05-31 22:22:41 +01:00
Phil Jackson
18a3cd7657 Stop using generic-mode. Highlight comments manually. 2010-05-31 22:22:40 +01:00
Phil Jackson
56fb23cf0b Merge branch 'rebase-mode' 2010-05-31 21:05:41 +01:00
Phil Jackson
6654af768d Don't allow the editing of lines which aren't action lines. 2010-05-31 21:05:12 +01:00
Phil Jackson
6c9a49461c c for pick, n and p for navigation. 2010-05-31 21:05:10 +01:00
Phil Jackson
c2c15b67c4 Only ask to abort when buffer is modified. 2010-05-31 21:05:08 +01:00
Phil Jackson
243de6b58c C-c C-c analogous to C-c # and C-c C-k analogous to a. 2010-05-31 21:05:06 +01:00
Phil Jackson
927f9b2206 Merge remote branch 'refs/remotes/avar/avar/interactive-rebase-read-rev' 2010-05-31 18:10:06 +01:00
Ævar Arnfjörð Bjarmason
40dc79f33b Use (magit-read-rev) for "Interactively rebase to:" message 
Now it has tab completion like the switch branch command and others
which use (magit-read-rev).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 2010-05-31 17:06:52 +00:00
Phil Jackson
fb5e8eb382 Merge branch 'rebase-mode' 2010-05-31 17:46:56 +01:00
Phil Jackson
ddc55ba6a0 Move column handling up a level in move functions. 2010-05-31 17:38:47 +01:00
Phil Jackson
4ad4e945c3 Keep column position when moving lines. 2010-05-31 17:17:53 +01:00
Phil Jackson
98b845afa1 Create the edit function dynamically so we get a description in `describe-mode'. 2010-05-31 17:12:19 +01:00
Phil Jackson
41ab790cde Bit of formatting. 2010-05-31 17:00:02 +01:00
Phil Jackson
adb85163de Licence, a little commentary. 2010-05-31 16:56:04 +01:00
Phil Jackson
a7048a9b71 Clarify abort docs. 2010-05-31 16:54:39 +01:00
Phil Jackson
c0abcc096a Ask the user when aborting a rebase. 2010-05-31 16:51:06 +01:00