diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-07 02:03:25 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-07 02:10:36 +0400 |
| commit | 541d1fa85ca4741e8b6db281f3d788dcfc423bdc (patch) | |
| tree | 4d8309a5e271cc0891fd4c6c10550e73625e658b /Documentation/merge-config.txt | |
| parent | ec014eac0e9e6f30cbbca616090fa2ecf74797e7 (diff) | |
| parent | 0d8fc3efc65df74a2b39b3f9798861a1b2055b62 (diff) | |
Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions