Merge branch 'db/delta-applier' into db/text-delta

diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index 3013b8d0c21b4895f1eea05abfb8c89cd766bfb4..db0e030d69f92a1f52cd7c98de99504e850ab2db 100644 (file)
--- a/Documentation/git-mv.txt
+++ b/Documentation/git-mv.txt
@@ -3,17 +3,20 @@ git-mv(1)
 
 NAME
 ----
-git-mv - Script used to move or rename a file, directory or symlink.
+git-mv - Move or rename a file, a directory, or a symlink
 
 
 SYNOPSIS
 --------
- 'git-mv' [-f] [-n] <source> <destination>
- 'git-mv' [-f] [-n] [-k] <source> ... <destination directory>
+'git mv' <options>... <args>...
 
 DESCRIPTION
 -----------
 This script is used to move or rename a file, directory or symlink.
+
+ git mv [-f] [-n] <source> <destination>
+ git mv [-f] [-n] [-k] <source> ... <destination directory>
+
 In the first form, it renames <source>, which must exist and be either
 a file, symlink or directory, to <destination>.
 In the second form, the last argument has to be an existing
@@ -25,6 +28,7 @@ committed.
 OPTIONS
 -------
 -f::
+--force::
        Force renaming or moving of a file even if the target exists
 -k::
         Skip move or rename actions which would lead to an error
@@ -32,20 +36,9 @@ OPTIONS
         controlled by GIT, or when it would overwrite an existing
         file unless '-f' is given.
 -n::
+--dry-run::
        Do nothing; only show what would happen
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-Rewritten by Ryan Anderson <ryan@michonline.com>
-Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[1] suite