Edward Thomson 1c0b6a38ba Remove fastforward / uptodate from git_merge		2014-03-20 09:25:06 -07:00
..
dirty.c	Fix a few references to changed function signatures	2014-02-05 13:32:45 -08:00
renames.c	Prevent user's merge.conflictstyle from breaking tests	2014-02-05 13:35:26 -08:00
setup.c	Remove fastforward / uptodate from git_merge	2014-03-20 09:25:06 -07:00
simple.c	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
status.c	Add git_merge_status to provide info about an upcoming merge	2014-03-20 09:25:06 -07:00
submodules.c	Add reflog parameters to git_reset	2014-02-03 15:05:55 -08:00
trivial.c	git_checkout_opts -> git_checkout_options	2014-03-06 09:44:51 -08:00