Files · d362093f9e858cf48d3c09bbcacf01f057b58db1 · lvzhengyang / git2 · GitLab

History Find file

Introduce GIT_MERGE_CONFIG_* for merge.ff settings · d362093f

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

committed May 27, 2014

Name	Last commit	Last update
cmake/Modules		Loading commit data...
deps		Loading commit data...
docs		Loading commit data...
examples		Loading commit data...
include		Loading commit data...
script		Loading commit data...
src		Loading commit data...
tests		Loading commit data...
.HEADER		Loading commit data...
.gitattributes		Loading commit data...
.gitignore		Loading commit data...
.mailmap		Loading commit data...
.travis.yml		Loading commit data...
AUTHORS		Loading commit data...
CMakeLists.txt		Loading commit data...
CONTRIBUTING.md		Loading commit data...
CONVENTIONS.md		Loading commit data...
COPYING		Loading commit data...
Makefile.embed		Loading commit data...
PROJECTS.md		Loading commit data...
README.md		Loading commit data...
api.docurium		Loading commit data...
git.git-authors		Loading commit data...
libgit2.pc.in		Loading commit data...
libgit2_clar.supp		Loading commit data...