merge.c
74 KB
-
Introduce GIT_MERGE_CONFIG_* for merge.ff settings · d362093fgit_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true
Edward Thomson committed