diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-09 16:13:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-09 16:13:08 -0700 |
| commit | 5bcde3082d5f348ff8b02547126746b9b713c8d5 (patch) | |
| tree | a9fa14b89706e6bfd0dfcd22000d6d3b77c55cdd /builtin-merge-recursive.c | |
| parent | 3c076dbe3cffee3b5cbf34759d627c47a417c145 (diff) | |
| parent | 22e801f285eefb9d5887091741e19a2c4f9798bf (diff) | |
| download | git-5bcde3082d5f348ff8b02547126746b9b713c8d5.tar.gz | |
Merge branch 'maint'
* maint:
git-read-tree: document -v option.
Remove exec bit from builtin-fast-export.c
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions