summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:42:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:42:28 -0800
commitad9c8954638759658453588075b0e18af914f566 (patch)
treeeeea0efb9bc7f71e356867a314d7e857b6eca368 /builtin/merge.c
parentMerge branch 'es/unpack-trees-oob-fix' into maint (diff)
parentdoc/gitcore-tutorial: fix prose to match example command (diff)
downloadtgif-ad9c8954638759658453588075b0e18af914f566.tar.xz
Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint
Complete an update to tutorial that encourages "git switch" over "git checkout" that was done only half-way. * hw/tutorial-favor-switch-over-checkout: doc/gitcore-tutorial: fix prose to match example command
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions