diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-28 09:37:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-28 09:37:52 -0700 |
| commit | 3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7 (patch) | |
| tree | 3a73f3a9bfba6271f19c03b8553421ef6e61357c /ll-merge.h | |
| parent | Merge branch 'jn/doc-api-errors' (diff) | |
| parent | docs: clarify "preserve" option wording for git-pull (diff) | |
| download | tgif-3a183520b2f5cd3db708f8d6a5b7aaba2c1779e7.tar.xz | |
Merge branch 'ss/pull-rebase-preserve'
* ss/pull-rebase-preserve:
docs: clarify "preserve" option wording for git-pull
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions