Edward Thomson 0e0108f73f introduce git_conflict_iterator		2013-05-17 16:10:48 -05:00
..
default.c	introduce git_conflict_iterator	2013-05-17 16:10:48 -05:00
hard.c	Fix trailing whitespaces	2013-05-15 22:41:30 +02:00
mixed.c	Reset all static variables to NULL in clar's __cleanup	2012-11-23 11:41:56 +01:00
reset_helpers.c	Add git_reset()	2012-06-07 21:27:30 +02:00
reset_helpers.h	Add git_reset()	2012-06-07 21:27:30 +02:00
soft.c	reset: Cannot soft reset with a conflicted index	2013-01-04 18:43:34 +01:00