diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:23 +0900 |
| commit | c0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e (patch) | |
| tree | 12d81309e4c60bd20bef4c9fb374729472831a77 /git-merge-one-file.sh | |
| parent | Merge branch 'ls/checkout-encoding' (diff) | |
| parent | glossary: substitute "ancestor" for "direct ancestor" in 'push' description. (diff) | |
| download | tgif-c0bdbac449e8f2ca8fb9a3da2700d0ea1dfb636e.tar.xz | |
Merge branch 'so/glossary-ancestor'
Docfix.
* so/glossary-ancestor:
glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions