diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-16 14:32:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-16 14:32:59 -0800 |
| commit | da656f17d37fe96454645c08f21a24134f5aa900 (patch) | |
| tree | 4fb50c4122a0e00a9fd2baac4849d0249b818113 /fast-import.c | |
| parent | 960ac5ff99304404d287b8174d7c8a7743c6d97a (diff) | |
| parent | 6a7f71d376becc1a5b0357b682dd0c20842104b0 (diff) | |
| download | git-da656f17d37fe96454645c08f21a24134f5aa900.tar.gz | |
Merge branch 'maint-1.7.2' into maint-1.7.3
* maint-1.7.2:
fast-import: introduce "feature notes" command
fast-import: clarify documentation of "feature" command
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c index 7563e43a39..8be8a5b732 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2815,6 +2815,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; } |