summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-05-06 22:10:32 +0000
committerJunio C Hamano <gitster@pobox.com>2017-05-08 15:12:58 +0900
commitace976b26ced2f35415119984f9d58d26b478afd (patch)
treead951b2f4927afccdea4da9f0cc658338858599b /merge.c
parent6f37eb7d858ef7fff79ee083c98ee99ab9bc05a4 (diff)
downloadgit-ace976b26ced2f35415119984f9d58d26b478afd.tar.gz
sequencer: convert fast_forward_to to struct object_id
fast_forward_to is required for checkout_fast_fowrard, which is required for parse_tree_indirect. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions