summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-12-12 02:50:31 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-12 11:49:49 -0800
commitcfe21f05bb0051aebc96ed7e805a79778f9bb117 (patch)
tree1ab6f5207c4e6c1c7634983814e296fe52fe5afa
parentstripspace: fix outdated comment (diff)
downloadtgif-cfe21f05bb0051aebc96ed7e805a79778f9bb117.tar.xz
docs: mention "-k" for both forms of "git mv"
The "git mv" synopsis shows two forms: renaming a file, and moving files into a directory. They can both make use of the "-k" flag to ignore errors, so mention it in both places. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-mv.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index b8db373964..4be7a718e6 100644
--- a/Documentation/git-mv.txt
+++ b/Documentation/git-mv.txt
@@ -15,7 +15,7 @@ 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>
git mv [-f] [-n] [-k] <source> ... <destination directory>
In the first form, it renames <source>, which must exist and be either