Merge remote branch 'origin/master'

simonjefford · Dec 1, 2009 · 957248b · 957248b
2 parents a4ee2be + 385e604
commit 957248b
Show file tree

Hide file tree

Showing 2 changed files with 446 additions and 102 deletions.
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
@@ -47,12 +47,20 @@ that are part of Git repositories).
                                                 *fugitive-:Glcd*
 :Glcd [directory]       |:lcd| relative to the repository.
 
+                                                *fugitive-:Gstatus*
+:Gstatus                Bring up the output of git status in the preview
+                        window.  Press - to stage or unstage the file on the
+                        cursor line.
+
                                                 *fugitive-:Ggrep*
 :Ggrep [args]           |:grep| with git-grep as 'grepprg'.
 
                                                 *fugitive-:Glog*
-:Glog                   Load all commits that touched the current file into
-                        the quickfix list.
+:Glog [args]            Load all previous revisions of the current file into
+                        the quickfix list.  Additional git-log arguments can
+                        be given (for example, --reverse).  If "--" appears as
+                        an argument, no file specific filtering is done, and
+                        commits are loaded into the quickfix list.
 
                                         *fugitive-:Gedit* *fugitive-:Ge*
 :Gedit [revision]       |:edit| a |fugitive-revision|.
@@ -78,10 +86,26 @@ that are part of Git repositories).
                         git add on a stage file, but without writing anything
                         to disk.
 
+                                                *fugitive-:Gwrite*
+:Gwrite                 Write to the current file's path and stage the results.
+                        When run in a work tree file, it is effectively git
+                        add.  Elsewhere, it is effectively git checkout.  A
+                        great deal of effort is expended to behave sensibly
+                        when the work tree or index version of the file is
+                        open in another buffer.
+
+:Gwrite {path}          You can give |:Gwrite| an explicit path of where in
+                        the work tree to write.  You can also give a path like
+                        :0:foo.txt or even :0 to write to just that stage in
+                        the index.
+
                                                 *fugitive-:Gdiff*
-:Gdiff [revision]       Perform a |vimdiff| the current file against the index
-                        or the given revision.  Use |do| and |dp| and write to
-                        the index file to simulate git add -p.
+:Gdiff [revision]       Perform a |vimdiff| against the current file in the
+                        given revision.  With no argument, the version in the
+                        index is used (which means a three-way diff during a
+                        merge conflict, making it a git mergetool
+                        alternative).  Use |do| and |dp| and write to the
+                        index file to simulate git add -p.
 
                                                 *fugitive-:Gmove*
 :Gmove {destination}    Wrapper around git-mv that renames the buffer
@@ -151,7 +175,7 @@ HEAD^:Makefile  The file named Makefile in the parent of HEAD
 -               The current file in HEAD
 ^               The current file in the previous commit
 ~3              The current file 3 commits ago
-:               A list of files in the index
+:               .git/index (Same as |:Gstatus|)
 :0              The current file in the index
 :1              The current file's common ancestor during a conflict
 :2              The current file in the target branch during a conflict