]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ace976b) | patch
merge: convert checkout_fast_forward to struct object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Sat, 6 May 2017 22:10:33 +0000 (22:10 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 May 2017 06:12:58 +0000 (15:12 +0900)
commitf06e90dac1f63f46d299ca728464fb0a450f6972
tree6b64076fb7d478c523ca915892f497b9d75b8932tree | snapshot
parentace976b26ced2f35415119984f9d58d26b478afdcommit | diff
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>
builtin/merge.c diff | blob | blame | history
builtin/pull.c diff | blob | blame | history
cache.h diff | blob | blame | history
merge.c diff | blob | blame | history
sequencer.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.