Stan Hu 7a74590d8f Fix rebase bug and include test for merge=union

2016-03-17 11:02:26 -04:00

..

analysis.c

s/git_merge_head/git_annotated_commit

2014-10-26 22:59:48 -04:00

dirty.c

merge::workdir::dirty: update to use st_ctime_nsec

2016-03-07 09:37:51 -05:00

recursive.c

merge: handle conflicts in recursive base building

2015-11-25 15:38:39 -05:00

renames.c

merge: rename git_merge_tree_flags_t -> git_merge_flags_t

2015-11-25 15:37:05 -05:00

setup.c

merge: lock the index at the start of the merge

2015-02-14 09:25:35 -05:00

simple.c

Fix rebase bug and include test for merge=union

2016-03-17 11:02:26 -04:00

submodules.c

reset: remove reflog message override

2015-03-03 14:40:50 +01:00

trivial.c

introduce git_index_entry_is_conflict

2015-05-28 09:47:31 -04:00