gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use 's' for staging, not 'a'.

Browse source
This commit is contained in:
Marius Vollmer 2008-08-13 00:01:10 +03:00
parent ff21f5abfc
commit ff389d33be
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
magit.el
View file

@ -212,8 +212,8 @@
(setq magit-mode-map (make-keymap)) (setq magit-mode-map (make-keymap))
(suppress-keymap magit-mode-map) (suppress-keymap magit-mode-map)
(define-key magit-mode-map (kbd "g") 'magit-status) (define-key magit-mode-map (kbd "g") 'magit-status)
(define-key magit-mode-map (kbd "A") 'magit-stage-all) (define-key magit-mode-map (kbd "s") 'magit-stage-thing-at-point)
(define-key magit-mode-map (kbd "a") 'magit-stage-thing-at-point) (define-key magit-mode-map (kbd "S") 'magit-stage-all)
(define-key magit-mode-map (kbd "u") 'magit-unstage-thing-at-point) (define-key magit-mode-map (kbd "u") 'magit-unstage-thing-at-point)
(define-key magit-mode-map (kbd "i") 'magit-ignore-thing-at-point) (define-key magit-mode-map (kbd "i") 'magit-ignore-thing-at-point)
(define-key magit-mode-map (kbd "?") 'magit-describe-thing-at-point) (define-key magit-mode-map (kbd "?") 'magit-describe-thing-at-point)

8
magit.texi
View file

@ -105,7 +105,7 @@ The first of these sections lists @emph{untracked files}. These are
the files that are present in your working tree but are not known to the files that are present in your working tree but are not known to
git; they are neither tracked in the current branch nor explicitly git; they are neither tracked in the current branch nor explicitly
ignored. You can move point to one of the listed files and type ignored. You can move point to one of the listed files and type
@kbd{a} to add it to the staging area. Or you can tell git to ignore @kbd{s} to add it to the staging area. Or you can tell git to ignore
the file by typing @kbd{i}. the file by typing @kbd{i}.
Magit has no shortcuts for removing or renaming files (yet). You need Magit has no shortcuts for removing or renaming files (yet). You need
@ -131,11 +131,11 @@ changes that you want to commit as a unit. You can leave changes that
you are not yet ready to commit safely out of the staging area. you are not yet ready to commit safely out of the staging area.
To move a hunk from the working tree into the staging area, move point To move a hunk from the working tree into the staging area, move point
into the hunk and type @kbd{a}. Likewise, to unstage a hunk, move into the hunk and type @kbd{s}. Likewise, to unstage a hunk, move
point into it and type @kbd{u}. If point is in a diff header when you point into it and type @kbd{u}. If point is in a diff header when you
type @kbd{a} or @kbd{u}, all hunks belonging to that diff are moved at type @kbd{s} or @kbd{u}, all hunks belonging to that diff are moved at
the same time. To move all hunks of all diffs into the staging area the same time. To move all hunks of all diffs into the staging area
in one go, type @kbd{A}. in one go, type @kbd{S}.
Once you have a set of changes in the staging area that you want to Once you have a set of changes in the staging area that you want to
commit, you should write a short description of them and then commit commit, you should write a short description of them and then commit