• Show log

    Commit

  • Hash : d362093f
    Author : Edward Thomson
    Date : 2014-05-08T15:41:36

    Introduce GIT_MERGE_CONFIG_* for merge.ff settings git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true