From 79339bfa8117292ea665173319af65b8399782f7 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Mon, 11 Jan 2010 15:21:43 -0500
Subject: [PATCH] :Gread is now equivalent to :Gread!

---
 doc/fugitive.txt    | 14 ++++++++------
 plugin/fugitive.vim |  5 +----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/fugitive.txt b/doc/fugitive.txt
index 3c90e8a..b1757d5 100644
--- a/doc/fugitive.txt
+++ b/doc/fugitive.txt
@@ -21,7 +21,7 @@ get back to the commit.
 
 Edit a file in the work tree and make some changes.  Use |:Gdiff| to open up
 the indexed version.  Use |do| and |dp| on various hunks to bring the files in
-sync, or use |:Gread!| to pull in all changes.  Write the indexed version to
+sync, or use |:Gread| to pull in all changes.  Write the indexed version to
 stage the file.
 
 Run |:Gblame| in a work tree file to see a blame in a vertical split.  Press
@@ -90,14 +90,16 @@ that are part of Git repositories).
 :Gpedit [revision]      |:pedit| a |fugitive-revision|
 
                                                 *fugitive-:Gread*
+:Gread [revision]       Empty the buffer and |:read| a |fugitive-revision|.
+                        When the argument is omitted, this is similar to git
+                        checkout on a work tree file or git add on a stage
+                        file, but without writing anything to disk.
+
 :{range}Gread [revision]
-                        |:read| a |fugitive-revision|
+                        |:read| in a |fugitive-revision| after {range}.
 
                                                 *fugitive-:Gread!*
-:Gread! [revision]      Empty the buffer and |:read| a |fugitive-revision|.
-                        This is similar to git checkout on a work tree file or
-                        git add on a stage file, but without writing anything
-                        to disk.
+:Gread! [revision]      Deprecated synonym for |:Gread|.
 
                                                 *fugitive-:Gwrite*
 :Gwrite                 Write to the current file's path and stage the results.
diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index f47e62b..3fa3c23 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -732,15 +732,12 @@ function! s:Edit(cmd,...) abort
   catch /^fugitive:/
     return 'echoerr v:errmsg'
   endtry
-  if a:cmd =~# 'read!$'
+  if a:cmd =~# 'read!$' || a:cmd ==# 'read'
     return '%delete|read '.s:fnameescape(file).'|1delete_|diffupdate|'.line('.')
   else
     if &previewwindow && getbufvar('','fugitive_type') ==# 'index'
       wincmd p
     endif
-    if a:cmd == 'read'
-      call s:warn('Use :.Gread for future compatibility')
-    endif
     return a:cmd.' '.s:fnameescape(file)
   endif
 endfunction