| commit | a4c912654e690ab52399be5908ed5bd3316a22c5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 00:48:19 +0000 (9 16:48 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Feb 2011 00:48:19 +0000 (9 16:48 -0800) | ||
| tree | bc475366e45df2962a35e3ddcb87b900cc84b21c | treesnapshot (tar.gz zip) |
| parent | 3b781df0a25d5ba23bd2603b0e3e9bb4731369df | commitdiff |
| parent | 1a9fe453263137be7d42e6fbfc041b5b2d9521d7 | commitdiff |
Merge branch 'master' into next
* master:
fast-import: introduce "feature notes" command
fast-import: clarify documentation of "feature" command
Documentation/merge subtree How-To: fix typo
Conflicts:
Documentation/howto/using-merge-subtree.txt
* master:
fast-import: introduce "feature notes" command
fast-import: clarify documentation of "feature" command
Documentation/merge subtree How-To: fix typo
Conflicts:
Documentation/howto/using-merge-subtree.txt