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 /Documentation/git-diff-files.txt | |
| parent | Documentation/merge subtree How-To: fix typo (diff) | |
| parent | fast-import: introduce "feature notes" command (diff) | |
| download | tgif-a8e4a5943a63c8fd4a3a9b70ccf4608bcc973707.tar.xz | |
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 'Documentation/git-diff-files.txt')
0 files changed, 0 insertions, 0 deletions