summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2017-05-06 22:10:33 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-08 15:12:58 +0900
commitf06e90dac1f63f46d299ca728464fb0a450f6972 (patch)
tree6b64076fb7d478c523ca915892f497b9d75b8932 /Documentation/howto/revert-a-faulty-merge.txt
parentsequencer: convert fast_forward_to to struct object_id (diff)
downloadtgif-f06e90dac1f63f46d299ca728464fb0a450f6972.tar.xz
merge: convert checkout_fast_forward to struct object_id
Converting checkout_fast_forward is required to convert parse_tree_indirect. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions