summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-16 14:32:54 -0800
committerJunio C Hamano <gitster@pobox.com>2011-02-16 14:32:54 -0800
commit6a7f71d376becc1a5b0357b682dd0c20842104b0 (patch)
treeba879dbaea99673de8f6e7dfca24e8f2e18dc628 /sha1_file.c
parent7a876edf5d5224e0755cfabb808b042f300e293d (diff)
parent206af7c96b134b4962fa04fa174a25f29efd7e5e (diff)
downloadgit-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 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions