Redone key bindings for pulling, leaving 'U' free for unstage-all.
This commit is contained in:
parent
52f61d6107
commit
151ae0a8a3
3 changed files with 19 additions and 14 deletions
7
NEWS
7
NEWS
|
@ -2,11 +2,8 @@ Changes in magit 0.6:
|
|||
|
||||
* Magit works with Git 1.6.0 now. (John Wiegley)
|
||||
|
||||
* Key bindings and command behavior for diffing, history listing, and
|
||||
resetting have changed. Please see the manual.
|
||||
|
||||
* Some key bindings have been added for moving around in the status
|
||||
buffer.
|
||||
* Many key bindings and the behavior of many commands have changed.
|
||||
Please see the manual.
|
||||
|
||||
* All buffers created by Magit are now in magit-mode and share all key
|
||||
bindings.
|
||||
|
|
9
magit.el
9
magit.el
|
@ -445,8 +445,9 @@ Many Magit faces inherit from this one by default."
|
|||
(define-key map (kbd "m") 'magit-manual-merge)
|
||||
(define-key map (kbd "M") 'magit-automatic-merge)
|
||||
(define-key map (kbd "R") 'magit-rebase-step)
|
||||
(define-key map (kbd "U") 'magit-pull)
|
||||
(define-key map (kbd "P") 'magit-push)
|
||||
(define-key map (kbd "f") 'magit-remote-update)
|
||||
(define-key map (kbd "F") 'magit-pull)
|
||||
(define-key map (kbd "c") 'magit-log-edit)
|
||||
(define-key map (kbd "C") 'magit-add-log)
|
||||
(define-key map (kbd "$") 'magit-display-process)
|
||||
|
@ -808,7 +809,11 @@ Please see the manual for a complete description of Magit.
|
|||
(if (yes-or-no-p "Discard all uncommitted changes? ")
|
||||
(magit-run "git" "reset" "--hard")))
|
||||
|
||||
;;; Push and pull
|
||||
;;; Updating, pull, and push
|
||||
|
||||
(defun magit-remote-update ()
|
||||
(interactive)
|
||||
(magit-run "git" "remote" "update"))
|
||||
|
||||
(defun magit-pull ()
|
||||
(interactive)
|
||||
|
|
17
magit.texi
17
magit.texi
|
@ -283,10 +283,12 @@ Such a rebase can be finished with @kbd{R} as well.
|
|||
@node Pushing and Pulling
|
||||
@chapter Pushing and Pulling
|
||||
|
||||
Magit will run @code{git pull} when you type @kbd{U} in the status
|
||||
buffer, and it will run @code{git push} when you type @kbd{P}. You
|
||||
can type @kbd{$} to pop up a buffer with the transcript of running
|
||||
these commands.
|
||||
Magit will run @code{git push} when you type @kbd{P}. You can type
|
||||
@kbd{$} to pop up a buffer with the transcript of running these
|
||||
commands.
|
||||
|
||||
Typing @kbd{f} will run @code{git remote update} and @kbd{F} will run
|
||||
@code{git pull}.
|
||||
|
||||
That's almost all the support for remote repositories that Magit
|
||||
offers. You should have setup your Git configuration to do the right
|
||||
|
@ -298,9 +300,10 @@ branch (by setting the Git config option
|
|||
status buffer header.
|
||||
|
||||
In this case, the status buffer will also have a @emph{Unpushed
|
||||
commits} section that shows the commits on you current head that are
|
||||
commits} section that shows the commits on yourcurrent head that are
|
||||
not in the branch named @code{<remote>/<branch>}. This section works
|
||||
much like the history buffer: you can see details about a commit with
|
||||
@kbd{RET}, and compare two of them with @kbd{.} and @kbd{=}.
|
||||
just like the history buffer: you can see details about a commit with
|
||||
@kbd{RET}, and compare two of them with @kbd{.} and @kbd{=}, and you
|
||||
can reset your current head to one of them with @kbd{x}, for example.
|
||||
|
||||
@bye
|
||||
|
|
Loading…
Reference in a new issue