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
Gwenhael Le moine
eb3583856e
add, slightly modified slackware(32 bits)'s mozilla-firefox SlackBuild
...
it will download the latest nightly build and package it
2010-03-27 17:59:27 +07: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
Ben Walton
d589942f5a
Add an rpm .spec file
...
Add a modest rpm .spec file and ensure that it's autoconf'd to keep
step with the release version number.
Ignore the generated .spec file, but ensure it's distributed with any
tarballs.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
2010-03-24 10:14:22 +00:00
Ben Walton
7bf25f3251
Depend on specific version of automake.
...
Makefile.am uses $builddir, which isn't available in older (<= 1.9)
versions of automake. Declare this requirement explictly in
configure.acy.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
2010-03-24 10:14:22 +00:00
Ben Walton
6d71fb57ae
Add --with-site-start support to configure
...
The autoconf/automake files now honour --with-site-start to allow
selection of the directory where automatically sourced elisp files are
stored. The original default is retained.
This switch makes support of non-debian systems easier. RHEL5, for
example, places these files in /usr/emacs/site-lisp/site-start.d/.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
2010-03-24 10:14:22 +00:00
Gwenhael Le moine
e2ee2c25d6
simpler doc path, remove crust
2010-03-23 22:09:49 +07:00
Gwenhael Le moine
496fb84e9b
Merge branch 'master' of github.com:cycojesus/slackbuilds
2010-03-23 07:42:19 +07:00
Gwenhael Le moine
2b0f081e26
version numbers
...
Signed-off-by: Gwenhael Le moine <gwenhael.le.moine@gmail.com>
2010-03-23 07:42:00 +07:00
Gwenhael Le moine
0c39ecc831
add to satisfy bitbake/OE
2010-03-22 22:47:08 +07:00
Gwenhael Le Moine
5f457194d9
add bzr pull (don't ask)
2010-03-22 15:09:24 +07:00
Gwenhael Le Moine
b98ae812f5
add xap/zathura, a PDF viewer
2010-03-22 15:06:50 +07: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
Gwenhael Le Moine
044465dd21
tried to make it work with git master..., failed
2010-03-19 14:39:27 +07:00
Gwenhael Le Moine
4ea0388b58
got it working \o/
2010-03-19 13:28:31 +07:00
Gwenhael Le Moine
37501795e5
add doc/perl6-book (WIP)
...
Signed-off-by: Gwenhael Le Moine <cycojesus@darkstar.(none)>
2010-03-19 12:59:05 +07: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
Gwenhael Le Moine
30892b9039
add link to sml-modeline.el
2010-03-18 16:07:30 +07:00
Gwenhael Le Moine
4b8fc96c44
add the "Ruby best practices" book
2010-03-18 10:51:09 +07:00
Gwenhael Le moine
f1679db694
add rainbow-parens
2010-03-16 22:28:17 +07:00
Gwenhael Le moine
ea3937198d
add paredit
2010-03-16 22:25:28 +07:00
Gwenhael Le moine
99f97bd890
add minimap (gorgeous!)
2010-03-16 22:18:34 +07:00
Phil Jackson
42c63c3a10
Merge remote branch 'refs/remotes/AlexeyVoinov/git-stash-fixes'
2010-03-16 13:42:53 +00:00
Phil Jackson
0074a3185c
Merge branch 'fancy-log-output'.
2010-03-16 13:34:44 +00:00
Alexey Voinov
6e9e517e6f
Use sha1 to differetiate between stashes, not stash number
2010-03-16 16:18:16 +03:00
Alexey Voinov
f754864373
Don't show empty *magit-stash* buffer.
2010-03-16 15:48:54 +03:00
Alexey Voinov
7dad3be958
Show the right buffer when showing stash
2010-03-16 15:48:54 +03:00
Gwenhael Le moine
bcec83b6e7
Merge branch 'master' of github.com:cycojesus/slackbuilds
2010-03-16 19:06:54 +07:00
Gwenhael Le moine
6620337c9f
add e/emacs-w3m
2010-03-16 18:56:36 +07:00
Gwenhael Le moine
5abe928075
stolen and updated from SBo (12.2)
2010-03-16 08:57:17 +07:00
Gwenhael Le moine
9b28c09cb9
bzr's weird (or I'm thick)
2010-03-15 18:08:07 +07:00
Gwenhael Le moine
54160d1a00
txz
2010-03-15 17:58:35 +07:00
Gwenhael Le moine
efdceba1b4
stolen and updated from SBo (12.2)
2010-03-15 17:55:43 +07:00