diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-11 11:54:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-11 11:54:46 +0300 |
| commit | 1c536069780bc67c05e621f0485f787d04559f24 (patch) | |
| tree | 671a0f4b114d7fec8644a5e07d09ab355a654f85 /builtin-merge-recursive.c | |
| parent | 702088afc680afef231d4a24bb5890f1d96a2cc9 (diff) | |
| parent | 92aeb994d3195d3601df2e37052d60f9a6738b61 (diff) | |
Merge branch 'maint'
* maint:
git-pull documentation: warn about the option order
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions