diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:40:12 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:40:12 -0800 |
commit | a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707 (patch) | |
tree | 8a4b75f257082a2361eb75d963a7bc8546bbfc07 /git-compat-util.h | |
parent | 59ab4eb36e20b0df9231e736f7d685fb43ad9364 (diff) | |
parent | 547e8b9205349b47003ed25a82673e413e71c255 (diff) | |
download | git-a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707.tar.gz |
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
Diffstat (limited to 'git-compat-util.h')
0 files changed, 0 insertions, 0 deletions