diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-25 01:29:35 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-25 01:29:35 +0300 |
commit | 8992def6b35350b401fd9935165dd7835c198771 (patch) | |
tree | 89145becb17bacd4b30e00454cfc6d613aabd45a /builtin-merge-file.c | |
parent | 74567ac0018247cbe08a5c1a1b1176a51ec2e49e (diff) | |
parent | 680b469e83c23ea682786acb661ad3835f779fb8 (diff) |
Merge branch 'sn/reset-doc-typofix' into maint
Doc update.
* sn/reset-doc-typofix:
doc: git-reset: fix a trivial typo
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions