Merge branch 'maint-1.7.0' into maint
* maint-1.7.0: fast-import: introduce "feature notes" command fast-import: clarify documentation of "feature" command Conflicts: Documentation/git-fast-import.txt
This commit is contained in:
@ -2991,6 +2991,8 @@ static int parse_one_feature(const char *feature, int from_stream)
|
||||
relative_marks_paths = 0;
|
||||
} else if (!prefixcmp(feature, "force")) {
|
||||
force_update = 1;
|
||||
} else if (!strcmp(feature, "notes")) {
|
||||
; /* do nothing; we have the feature */
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user