diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:28:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:28:06 -0800 |
| commit | c50230f75109677d7adf0bd94f99d17f35a519a6 (patch) | |
| tree | 58d077c474e804bbd40133505fa0ee8d72c4a28d /merge-recursive.c | |
| parent | log --format: document %w (diff) | |
| parent | rebase docs: clarify --merge and --strategy (diff) | |
| download | tgif-c50230f75109677d7adf0bd94f99d17f35a519a6.tar.xz | |
Merge branch 'tr/maint-merge-ours-clarification' (early part)
* 'tr/maint-merge-ours-clarification' (early part):
rebase docs: clarify --merge and --strategy
Documentation: clarify 'ours' merge strategy
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions