gwh's SlackBuilds
Find a file
Rémi Vanicat 6d2c6b7d98 in interactive merge, rename ours to current and their to merged.
When rebasing it's not clear which commit is ours, and which is
theirs, the new name should be clearer.
2009-03-02 10:43:56 +01:00
debian Build-Depend on emacsen instead of on emacs. 2009-02-19 23:03:25 +02:00
test Deleted. 2008-09-07 16:42:18 +03:00
.gitignore Ignore PDF and PS output. 2009-02-15 05:14:34 +02:00
50magit.el Make build cruft work. 2008-08-13 06:47:09 +03:00
AUTHORS Credit John. Thanks! 2009-01-28 22:23:46 +02:00
autogen.sh Provide autogen.sh 2008-08-13 07:11:44 +03:00
ChangeLog Added autotools cruft. 2008-08-13 06:20:36 +03:00
configure.ac Prepare 0.7. 2008-10-16 22:23:42 +03:00
COPYING Renamed to follow convention. 2008-08-06 02:46:58 +03:00
fdl.texi Added FDL text. 2008-08-12 04:51:45 +03:00
magit.el in interactive merge, rename ours to current and their to merged. 2009-03-02 10:43:56 +01:00
magit.texi Use ediff interactive merge to help conflict resolution. 2009-03-01 13:01:19 +01:00
Makefile.am Make build cruft work. 2008-08-13 06:47:09 +03:00
NEWS Documentation updates. 2009-03-01 03:00:23 +02:00
README Added link to mailing list. 2009-02-27 02:21:31 +02:00

It's magit!  A Emacs mode for Git.

I wrote magit while learning about git and trying to figure out how I
would be using git in a 'natural' way.  Magit will grow and hopefully
become more coherent as I learn more about git and good ways to use
it.  Feedback is welcome!

* Installing

Magit can be installed with the popular recipe of

   $ ./autogen.sh     # If you got the sources directly from Git
   $ ./configure
   $ 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.

* Getting started

To get started with magit, open any file in a git repository in Emacs
and run 'M-x magit-status'.  Read the online help of 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' for
example, or on the web at

    http://zagadka.vm.bytemark.co.uk/magit/magit.html

If you have questions, please use the mailing list at

    http://groups.google.com/group/magit/

Magit's web home is currently at

    http://zagadka.vm.bytemark.co.uk/magit/