proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-12-07 12:08:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
d362093f9e
libgit2/tests/merge/workdir
History
Edward Thomson d362093f9e 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
2014-05-27 20:49:16 -05:00
..
analysis.c Introduce GIT_MERGE_CONFIG_* for merge.ff settings 2014-05-27 20:49:16 -05:00
dirty.c merge: checkout default shouldn't clobber given 2014-04-23 19:43:35 -04:00
renames.c Remove git_merge_result as it's now unnecessary 2014-03-20 09:25:09 -07:00
setup.c Introduce git_merge_head_id 2014-03-31 11:43:38 -05:00
simple.c merge: checkout default shouldn't clobber given 2014-04-23 19:43:35 -04:00
submodules.c Remove git_merge_result as it's now unnecessary 2014-03-20 09:25:09 -07:00
trivial.c Remove git_merge_result as it's now unnecessary 2014-03-20 09:25:09 -07:00