git_merge_preference_t

The user's stated preference for merges.

Values

ValueMeaning
GIT_MERGE_PREFERENCE_NONE0

No configuration was found that suggests a preferred behavior for merge.

GIT_MERGE_PREFERENCE_NO_FASTFORWARD1 << 0

There is a merge.ff=false configuration setting, suggesting that the user does not want to allow a fast-forward merge.

GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY1 << 1

There is a merge.ff=only configuration setting, suggesting that the user only wants fast-forward merges.

Meta