gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
gwh's SlackBuilds
1077 commits 1 branch 0 tags 10 MiB
Shell 99.8%
Ruby 0.2%
Find a file
Ævar Arnfjörð Bjarmason 961d80dbf0 magit-rebase-info: solve the 'The "R" rebase method needs a small fix' issue 
Fix the bug in magit-rebase-info that I introduced in 81bb2ba. Here's
the description of the bug from a message of mine to the mailing list:

    I sent an incomplete fix for the "R" rebase method recently:

       http://github.com/philjackson/magit/pull/59

    But Phil pulled it in as-is:

       81bb2ba2d3

    Anyway, it needs a small fixup, this:

       (length (magit-file-lines ".git/rebase-merge/git-rebase-todo.backup"))

    Will be way off, because it'll count the (length) of lines like:

       ("pick cb925f0 check message..." "pick 2f811b6 take done length"
    "pick 29332e6 use backup" "" "# Rebase 19e2dd7..29332e6 onto 19e2dd7"
    "#" ...

    What it should do instead so we can get the correct count is to only
    count up until the "" (uninclusive) so the above example would return
    3.

    I couldn't find an idiomatic way of doing this in elisp, I could with
    the (loop) macro, but that'd require cl.el.

As it turns out magit already needs cl.el, so I can just use (loop) to
fix this.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
2010-09-29 11:31:26 +00:00
bin mk_rel.bash knows about the new Makefile. 2010-08-30 19:11:13 +01:00
.gitignore Provide simple Makefile so that auto* is not necessary. 2010-08-29 01:07:00 +03:00
50magit.el Make build cruft work. 2008-08-13 06:47:09 +03:00
COPYING Restore GPL 2010-09-04 04:40:19 +08:00
fdl.texi Added FDL text. 2008-08-12 04:51:45 +03:00
magit-key-mode.el Added the ability to push tags. 2010-09-28 17:00:56 +01:00
magit-pkg.el.in Elpanized. 2009-03-09 22:15:07 +02:00
magit-svn.el svn plugin now key-group aware. 2010-09-11 00:59:30 +01:00
magit-topgit.el incorrect hook was used to insert topgit section 2010-09-18 10:29:50 +02:00
magit.el magit-rebase-info: solve the 'The "R" rebase method needs a small fix' issue 2010-09-29 11:31:26 +00:00
magit.spec.in Removed unneeded files. 2010-08-30 19:11:46 +01:00
magit.texi Magit extensions documentation 2010-09-18 13:57:32 +02:00
Makefile in Makefile, fix the way we set emacs load-path 2010-09-29 02:40:11 -07:00
README.md Added detail about plugins to the README. 2010-09-13 16:53:31 +01:00
rebase-mode.el Fixed the action regexp which was too greedy. 2010-05-31 22:22:42 +01:00

README.md

It's Magit! A Emacs mode for Git.

Magit is an interface to Git for Emacs. Unlike Emacs's native version control support, Magit can take advantage of Git's native features without breaking compatibility with other systems.

To get started see the Magit User Manual or perhaps the cheatsheet if you're in a hurry. There's also an excellent Magit screencast by Alex Vollmer which demonstrates some of the major features.

Installing

Download the latest tarball from the github download page, then Magit can be installed with the popular recipe of:

make && sudo make install

This will put magit.el into /usr/local/share/emacs/site-lisp, where Emacs should be able to find it. Then add

(require 'magit)

to your .emacs file.

Magit also now supports extensions:

git-svn

(require 'magit-svn) - integrates with git-svn. Hit 'N' to see your options.

git-topgit

(require 'magit-topgit) - integrates with topgit.

Getting started

To get started with Magit, open any file in a Git repository in Emacs and run M-x magit-status. Read the short help for magit-mode (C-h m in the Magit buffer), make some changes to your files, and try to commit them.

Learning more

The Magit User Manual describes things with more words than the online help. You can read it in Emacs with C-u C-h i magit.info, or on the web.

If you have any questions, please use the mailing list at Google Groups.

Magit's website is currently hosted on GitHub.

Development

Magit was started by Marius Vollmer. Phil Jackson is the lead developer. For a full list of contributors have a look at magit.el in the source distribution.

Magit's canonical source repository is currently hosted on GitHub.