diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-02-16 14:32:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-16 14:32:59 -0800 |
| commit | da656f17d37fe96454645c08f21a24134f5aa900 (patch) | |
| tree | 4fb50c4122a0e00a9fd2baac4849d0249b818113 /builtin/merge-tree.c | |
| parent | rebase -i: clarify in-editor documentation of "exec" (diff) | |
| parent | Merge branch 'maint-1.7.1' into maint-1.7.2 (diff) | |
| download | tgif-da656f17d37fe96454645c08f21a24134f5aa900.tar.xz | |
Merge branch 'maint-1.7.2' into maint-1.7.3
* maint-1.7.2:
fast-import: introduce "feature notes" command
fast-import: clarify documentation of "feature" command
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions