aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/git-fast-import.txt2
-rw-r--r--fast-import.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 2be6c4b80..1fe2c1dcf 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -416,7 +416,7 @@ in octal. Git only supports the following modes:
of files in most projects use this mode. If in doubt, this is
what you want.
* `100755` or `755`: A normal, but executable, file.
-* `140000`: A symlink, the content of the file will be the link target.
+* `120000`: A symlink, the content of the file will be the link target.
In both formats `<path>` is the complete path of the file to be added
(if not already existing) or modified (if already existing).
diff --git a/fast-import.c b/fast-import.c
index df84e4d87..c72c5c7a9 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -81,7 +81,7 @@ Format of STDIN stream:
path_str ::= path | '"' quoted(path) '"' ;
mode ::= '100644' | '644'
| '100755' | '755'
- | '140000'
+ | '120000'
;
declen ::= # unsigned 32 bit value, ascii base10 notation;