Permalink
Browse files

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

  • Loading branch information...
1 parent ff21f5a commit ff389d33bee071cbc98b2894a798858299c053c2 Marius Vollmer committed Aug 12, 2008
Showing with 6 additions and 6 deletions.
  1. +2 −2 magit.el
  2. +4 −4 magit.texi
View
@@ -212,8 +212,8 @@
(setq magit-mode-map (make-keymap))
(suppress-keymap magit-mode-map)
(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 "a") 'magit-stage-thing-at-point)
+ (define-key magit-mode-map (kbd "s") '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 "i") 'magit-ignore-thing-at-point)
(define-key magit-mode-map (kbd "?") 'magit-describe-thing-at-point)
View
@@ -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
git; they are neither tracked in the current branch nor explicitly
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}.
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.
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
-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
-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
commit, you should write a short description of them and then commit

0 comments on commit ff389d3

Please sign in to comment.