diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-24 19:39:36 -0700 |
| commit | 80e013c0fd3daf0dfe2e047bd3349056192f8b18 (patch) | |
| tree | bbbff071e7d3c65cb7674442ee0eda2aaaeb4e0c /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'jt/avoid-prefetch-when-able-in-diff' (diff) | |
| parent | command-list.txt: add gitfaq to the list of guides (diff) | |
| download | tgif-80e013c0fd3daf0dfe2e047bd3349056192f8b18.tar.xz | |
Merge branch 'bc/faq'
"git help guides" now includes the newly added FAQ document.
* bc/faq:
command-list.txt: add gitfaq to the list of guides
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions