projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-recursive: conflicting rename case.
[git.git]
/
Documentation
/
git-mv.txt
diff --git
a/Documentation/git-mv.txt
b/Documentation/git-mv.txt
index
f2d5882
..
d242b39
100644
(file)
--- a/
Documentation/git-mv.txt
+++ b/
Documentation/git-mv.txt
@@
-8,14
+8,17
@@
git-mv - Script used to move or rename a file, directory or symlink.
SYNOPSIS
--------
SYNOPSIS
--------
-'git-mv' [-f] [-n] <source> <destination>
-'git-mv' [-f] [-k] [-n] <source> ... <destination directory>
+'git-mv' <options>... <args>...
DESCRIPTION
-----------
This script is used to move or rename a file, directory or symlink.
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
In the first form, it renames <source>, which must exist and be either
-a file, symlink or directory, to <destination>
, which must not exist
.
+a file, symlink or directory, to <destination>.
In the second form, the last argument has to be an existing
directory; the given sources will be moved into this directory.
In the second form, the last argument has to be an existing
directory; the given sources will be moved into this directory.
@@
-25,7
+28,7
@@
committed.
OPTIONS
-------
-f::
OPTIONS
-------
-f::
- Force renaming or moving
even targets exist
+ Force renaming or moving
of a file even if the target exists
-k::
Skip move or rename actions which would lead to an error
condition. An error happens when a source is neither existing nor
-k::
Skip move or rename actions which would lead to an error
condition. An error happens when a source is neither existing nor