]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.h
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e95e481) | patch
merge-recursive: split internal fields into a separate struct
authorElijah Newren <newren@gmail.com>
Sat, 17 Aug 2019 18:41:41 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2019 17:08:04 +0000 (10:08 -0700)
commit5bf7e5779ec6d5293b3135554d49e6fcee88d399
tree3e55a11dc2ee8d9c3423038af1deab6bcdd58795tree | snapshot
parente95e481f9e6e4dfe62380ccc8a47acf446403a94commit | diff
merge-recursive: split internal fields into a separate struct

merge_options has several internal fields that should not be set or read
by external callers.  This just complicates the API.  Move them into an
opaque merge_options_internal struct that is defined only in
merge-recursive.c and keep these out of merge-recursive.h.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | blame | history
merge-recursive.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.