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

484 commits

Author SHA1 Message Date
Moritz Bunkus
920c3b3a3c Guess the remote branch name from the branch's "merge" config item 
If you have a local tracking branch, e.g. called 'test', and the
remote branch name is different than test (e.g. 'somwhere/master')
then the commands for retrieving the unpulled and unpushed commits was
calling "git log test..somwehere/test" which may or may not exist.
 2010-03-30 13:45:53 +01:00
Phil Jackson
33ea60d690 If wazzup head is detached then describe it so. 2010-03-29 21:21:09 +01:00
Rémi Vanicat
c51582ee17 Using HEAD as branch-name when this is a detached HEAD 2010-03-29 21:14:56 +01:00
Rémi Vanicat
82b8d93731 check for the current branch before switching buffer 
The wazzup buffer might already exist, so if we look at the branch
name in it, it might refer to another branch, even another repository.
 2010-03-29 20:57:27 +01:00
Rémi Vanicat
7c80c10199 Added docstring for section's function 2010-03-27 11:33:55 +00:00
Rémi Vanicat
07c3225ed6 Better documentation and error reporting. 
Corrected style error in comment, docstring, and error message, thanks to
checkdoc-minor-mode and Aspell.

Some indent and minor code style fix too
 2010-03-27 11:33:55 +00:00
Phil Jackson
27ef54451b Finished off documentation. 2010-03-26 16:36:55 +00:00
Phil Jackson
c23b334d29 Merge branch 'log-grep' 2010-03-26 16:33:50 +00:00
Phil Jackson
c7c02c2f20 Added the command `magit-log-grep' (no keybinding). 2010-03-26 16:33:32 +00:00
Phil Jackson
29395e0d46 `magit-refresh-log-buffer' can now take more than one (git commandline) argument. 2010-03-26 16:31:40 +00:00
Phil Jackson
f9283aaa0d Merge remote branch 'refs/remotes/philjackson/svn-find-rev' 2010-03-26 14:00:13 +00:00
Phil Jackson
0fc398039d Merge commit 'refs/merge-requests/11' of git://gitorious.org/magit/mainline 2010-03-20 16:24:05 +00:00
Phil Jackson
5dc924748a Merge commit 'refs/merge-requests/14' of git://gitorious.org/magit/mainline 2010-03-20 16:22:37 +00:00
Rémi Vanicat
bb74ce61af Show the graph in wazzup. 2010-03-20 13:33:31 +01:00
Rémi Vanicat
8c16b10141 Use view-mode for the *magit-process* buffer 
Now, q will bury the buffer, and several other keybindig will be
available
 2010-03-20 13:16:58 +01:00
Rémi Vanicat
ed0ad8eff7 use --pretty=format: * %H %s where needed 
The current magit-wash-log is made for commit with graph, so we must at least use
--pretty=format: * %H %s or the --graph for it to work as expected.
 2010-03-20 13:14:21 +01:00
Hannu Koivisto
ea0812f119 Add command magit-reset-head-hard. 
Intended to be bound to X instead of magit-reset-working-tree for those who
feel it is a more consistent pair for x.  Suggests HEAD and therefore works
like magit-reset-working-tree by default.  Eliminates need to use C-u x.
 2010-03-18 23:25:58 +02:00
Hannu Koivisto
8020b0396a Add command magit-toggle-file-section. 
For those who never want to toggle at hunk granularity.
 2010-03-18 23:25:58 +02:00
Hannu Koivisto
94ca78a86f Add command magit-goto-parent-section. 2010-03-18 23:25:58 +02:00
Hannu Koivisto
6a1bb4f644 Fix magit-get-top-dir from ruining paths with symlinks. 
One might argue that this also makes it work better in a case when GIT_DIR
points outside of a work tree, but because in that case any directory is a
valid "top dir" from GIT's point of view, that is debatable.  But at least
one can use Magit in that case by first making sure that default-directory
is the top dir and then executing magit-status.
 2010-03-18 23:25:58 +02:00
Hannu Koivisto
01d58d4385 Fix magit-log-edit-mode keymap definition and activation. 
Rely on the standard define-derived-mode functionality.
 2010-03-18 23:25:58 +02:00
Phil Jackson
0074a3185c Merge branch 'fancy-log-output'. 2010-03-16 13:34:44 +00:00
Phil Jackson
6f9993cbd4 Remove 'HEAD' from ref list. 2010-03-14 14:46:56 +00:00
Phil Jackson
a4cbd5ecd3 Refs matching was too greedy and causing some logs not to render. 2010-03-14 14:45:50 +00:00
Phil Jackson
d43a23b48f Merge remote branch 'refs/remotes/philjackson/fancy-log-pt1' 
Conflicts:
	magit.el
 2010-03-14 14:42:50 +00:00
Alexey Voinov
37731ad567 Replaced call-process-region with start-file-process and wait. 
call-process-region doesn't work with remote tramp
directories. Staging of diff hunks was broken.
 2010-03-12 17:43:18 +00:00
Rémi Vanicat
a291507171 In magit-ignore-file, add a new line if there wasn't one in the ignore file 2010-03-12 18:11:14 +01:00
Alexey Voinov
7ca25460fa emulate append-to-file, because it doesn't work over tramp 2010-03-12 18:11:14 +01:00
Pavel Holejsovsky
3d2321b317 Make async git invocation work on cygwin. 
Forces emacs to use pipes for communication with git subprocess.
Although default PTY method should work too, there is probably
something broken in cygwin causing that resulting process never
receives any input and hangs forever.

In any case, setting communication to 'pipe' is recommended by
start-process docs anyway for background processes, as it is usually
faster and more efficient.
 2010-03-11 14:12:30 +01:00
Phil Jackson
db53f15cb5 Merge remote branch 'refs/remotes/AlexeyVoinov/git-svn-fixes' 2010-03-11 11:18:30 +00:00
Alexey Voinov
4e59fade68 Fixed svn-ref-info for most non-standard layouts 2010-03-11 13:32:28 +03:00
Alexey Voinov
f65dfce86e magit-get-all is wrapper for git config --get-all 2010-03-11 13:20:41 +03:00
Phil Jackson
dddfe3035e Highlight only the diff markers (not the text after them). 2010-03-10 21:43:11 +00:00
Phil Jackson
f7f383bf1a Removed redundant call from `magit-get-svn-ref-info'. 2010-03-10 21:38:56 +00:00
Phil Jackson
9325431ad4 Added `magit-omit-untracked-dir-contents' to optionally stop magit listing everything in an untracked directory. 2010-03-10 21:38:04 +00:00
Phil Jackson
282303265f Merge remote branch 'refs/remotes/philjackson/git-svn-fixes-and-features' 2010-03-10 21:29:42 +00:00
Phil Jackson
10f88917ca Bug fix: Commit buffer will fill if the commit is current and the buffer dead. 2010-03-10 21:21:33 +00:00
Phil Jackson
f9f1c00c78 C-u will now keep the index when stashing. 2010-03-10 21:19:46 +00:00
Phil Jackson
a421f9f936 Merge remote branch 'refs/remotes/philjackson/squashable-merges' 2010-03-10 21:12:32 +00:00
Phil Jackson
131f9d1db3 Merge remote branch 'refs/remotes/philjackson/magit-completing-read' 2010-03-10 21:08:32 +00:00
Rémi Vanicat
dc48483ad6 Make magit ask for ssh passphrase 
Thanks to Rüdiger Sonderfeld <ruediger@c-plusplus.de>
 2010-02-23 08:00:47 +01:00
Phil Jackson
f8f6a2c103 Use `magit-present-log-line-function'. 2009-12-16 14:57:16 +00:00
Rémi Vanicat
cea34e5f8c [Tramp] Two more fix, make staging with magit on tramp dir possible 2009-11-09 11:14:44 +02:00
Rémi Vanicat
3b661f5db4 Always use magit-git-standard-options when calling git 2009-11-09 11:14:44 +02:00
Phil Jackson
dcbb449238 Box around labels. 2009-11-08 15:59:58 +00:00
Phil Jackson
5661df2222 Better label colours for lighter backgrounds. 2009-11-08 15:59:44 +00:00
Phil Jackson
02432300e1 Highlight refs according to their origin. 2009-11-08 14:54:53 +00:00
Marius Vollmer
d5b60fc53f Use --decorate=full so that it works again with Git 1.6.4. 
* magit.el (magit-configure-have-decorate):
(magit-refresh-log-buffer): Here.
 2009-11-08 13:45:20 +00:00
Marius Vollmer
78c098361c Use --decorate=full so that it works again with Git 1.6.4. 
* magit.el (magit-configure-have-decorate):
(magit-refresh-log-buffer): Here.
 2009-11-07 20:37:43 +02:00
Phil Jackson
83992a9ec2 `magit-svn-find-rev' now supports the prefix arg. 
* magit.el (magit-svn-find-rev): Prefix support for branch name.
* magit.texi: Documenting magit-svn-find-rev.
 2009-11-06 14:52:33 +00:00