diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-02-16 14:32:54 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-16 14:32:54 -0800 |
commit | 6a7f71d376becc1a5b0357b682dd0c20842104b0 (patch) | |
tree | ba879dbaea99673de8f6e7dfca24e8f2e18dc628 /t | |
parent | 7a876edf5d5224e0755cfabb808b042f300e293d (diff) | |
parent | 206af7c96b134b4962fa04fa174a25f29efd7e5e (diff) | |
download | git-6a7f71d376becc1a5b0357b682dd0c20842104b0.tar.gz |
Merge branch 'maint-1.7.1' into maint-1.7.2
* maint-1.7.1:
fast-import: introduce "feature notes" command
fast-import: clarify documentation of "feature" command
Diffstat (limited to 't')
-rwxr-xr-x | t/t9301-fast-import-notes.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh index a5c99d8507..164edf0c3d 100755 --- a/t/t9301-fast-import-notes.sh +++ b/t/t9301-fast-import-notes.sh @@ -120,6 +120,7 @@ test_expect_success 'add notes with simple M command' ' test_tick cat >input <<INPUT_END +feature notes commit refs/notes/test committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE data <<COMMIT |