35 lines
1.4 KiB
EmacsLisp
35 lines
1.4 KiB
EmacsLisp
|
;;; git-status -- control git from Emacs.
|
||
|
|
||
|
;; Copyright (C) 2008 Marius Vollmer
|
||
|
;;
|
||
|
;; Git-status is free software; you can redistribute it and/or modify
|
||
|
;; it under the terms of the GNU General Public License as published
|
||
|
;; by the Free Software Foundation; either version 3, or (at your
|
||
|
;; option) any later version.
|
||
|
;;
|
||
|
;; Git-status is distributed in the hope that it will be useful,
|
||
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
|
;; GNU General Public License for more details.
|
||
|
;;
|
||
|
;; You should have received a copy of the GNU General Public License
|
||
|
;; along with GNU Emacs; see the file COPYING. If not, write to
|
||
|
;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
|
;; Boston, MA 02111-1307, USA.
|
||
|
|
||
|
;;; Introduction
|
||
|
|
||
|
;; Invoking the git-status function will show a buffer with the
|
||
|
;; current status of the current git repository and its checkout.
|
||
|
;; That buffer offers key bindings for manipulating the status in
|
||
|
;; simple ways.
|
||
|
;;
|
||
|
;; The status buffer mainly shows the difference between the working
|
||
|
;; tree and the index, and the difference between the index and the
|
||
|
;; current HEAD. You can 'stage' individual hunks from the working
|
||
|
;; tree to the index, and you can commit the index. The commit
|
||
|
;; message needs to be prepared in a special area of the status buffer
|
||
|
;; before committing.
|
||
|
;;
|
||
|
;; The status buffer also supports resolving conflicts.
|