Gwenhael Le Moine
306c91b0b2
fix doinst.sh
2010-04-13 11:17:03 +07:00
Gwenhael Le Moine
f7b86e0d15
pathes
2010-04-13 11:15:37 +07:00
Gwenhael Le Moine
da47495a7e
add l/libconfig (for eliot)
2010-04-13 11:13:13 +07:00
Gwenhael Le Moine
2934ca2f1b
update description
2010-04-13 11:03:45 +07:00
Gwenhael Le Moine
6cba8104a0
add l/arabica (for eliot)
2010-04-13 11:00:37 +07:00
Gwenhael Le Moine
3af5862b44
typo
2010-04-13 09:12:41 +07:00
Gwenhael Le Moine
caad1cfd26
typo
2010-04-13 09:09:57 +07:00
Phil Jackson
7e22c2b044
Merge branch 'more-keymaps'
2010-04-12 14:17:59 +01:00
Rémi Vanicat
d976e65dbf
Regrouping command that create new view of current git repositories.
...
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Rémi Vanicat
6312006a54
Moving function related to current status
...
magit-reset-head is also put wherever there are commits
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Rémi Vanicat
d5dd0578ba
Moving function working specifically on status hunk, diff and files
...
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Rémi Vanicat
3eec4705bc
Moving merging and branching function where there are commit and branch.
...
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Rémi Vanicat
6328782833
Moving apply, cherry-pick and revert function.
...
They all apply to hunk, commit and diff that are in
status, stash, log, reflog, diff and wazzup buffers.
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Rémi Vanicat
bca27d36bb
Moving diff view function where there are commits.
...
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Rémi Vanicat
682809d82d
Moving staging function to status buffer
...
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Rémi Vanicat
d2b814ad9e
Moving hunk size modifier in modes where there are hunks.
...
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Rémi Vanicat
9105c3e557
Added minor mode for the different magit buffer.
...
Signed-off-by: Rémi Vanicat <vanicat@debian.org>
2010-04-12 14:08:11 +01:00
Gwenhael Le Moine
ef274f6a7c
add article-mode
2010-04-12 16:38:57 +07:00
Gwenhael Le moine
82c1b86d57
add xap/matchbox-keyboard
2010-04-08 10:05:41 +07:00
Gwenhael Le moine
e3edb48ea1
add for matchbox-keyboard
2010-04-08 10:04:10 +07:00
Gwenhael Le moine
2b6dd92166
add zenburn
2010-04-04 23:14:58 +07:00
Moritz Bunkus
8175d6dfad
Only start the server if it isn't running
...
magit's interactive rebase feature tries to start the server even if
it is already running. If it is already running then Emacs asks
whether or not it should destroy existing clients. This is fatal if
the frame magit is running in was created by emacsclient
itself (e.g. Emacs is running in the background with "--daemon"), so
the user has to answer "no".
This question can be avoided if the server is only startet if it isn't
already running.
2010-04-01 11:16:12 +01:00
Phil Jackson
b09375ebe2
Merge branch 'fancy-branch-view'
2010-04-01 01:58:14 +01:00
Phil Jackson
e7a3b608e6
Fix `magit--branch-name-at-point'.
2010-04-01 01:55:56 +01:00
Phil Jackson
db44227cb0
Use fundamental-mode' rather than
text-mode'
2010-04-01 01:53:35 +01:00
Phil Jackson
290d5fe70f
Comments, removed old-point code which did nothing.
2010-04-01 01:51:43 +01:00
Phil Jackson
f735945848
Fix `magit--is-branch-at-point-remote'
2010-04-01 01:48:28 +01:00
Phil Jackson
8053974385
Revert "Fix `magit--branch-name-at-point'."
...
This reverts commit e6e77c611f
.
Reverting "Fix `magit--branch-name-at-point'." which I meant to put on another branch.
2010-04-01 01:25:10 +01:00
Phil Jackson
e6e77c611f
Fix `magit--branch-name-at-point'.
2010-04-01 01:23:36 +01:00
Phil Jackson
bf49b72cf0
Removed "remotes" from the branch name.
2010-04-01 01:17:09 +01:00
Phil Jackson
a86fab4e97
n/p now allow the user to move about in branch-view.
2010-03-30 23:08:50 +01:00
Phil Jackson
1ae36db891
Put branch name in text properties.
2010-03-30 23:07:09 +01:00
Phil Jackson
b261669efe
Have `magit--branch-name-from-line' pull out the branch name.
2010-03-30 22:45:59 +01:00
Phil Jackson
79d7f46502
Bit more output.
2010-03-30 22:45:05 +01:00
Phil Jackson
e09ef67ea6
SHA1 gets colour.
2010-03-30 22:32:43 +01:00
Moritz Bunkus
ad686c5938
Provide useful functions for the branch list
...
The following functions are available from the branch list (which in
turn is made read-only):
- Checking out the branch in the current line
- Deleting the branch in the current line (prefix forces deletion even
if not merged into current branch); works on both local and remote
branches
- Manual and automatic merges of the branch in the current line into
the current branch
- Quitting the branch list
Includes updated documentation.
2010-03-30 14:53:45 +01:00
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