Merge branch 'fc/update' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 18:41:44 +0000 (13:41 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 18:41:44 +0000 (13:41 -0500)
commit86ff39c8a88ceac1354cb5ec304194124d29b5f4
tree8beb58fb1cd130889a32d0bdc23ac8e466520838
parent3aa698a802ebeeb079b3730c33d40efc29e5dc81
parentbe20c0d715776d425cd9c141f023e4b9b181c1c5
Merge branch 'fc/update' into integration

* fc/update:
  Add new `git update` tool
  merge: add --reverse-parents option
  commit: support for multiple MERGE_MODE
.gitignore
Makefile