Merge branch 'fc/update' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 16:55:03 +0000 (11:55 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 16:55:03 +0000 (11:55 -0500)
commit93ad66dfe4600081ae23cfab0bb814e7cbce0e95
tree3808edbe6b530d5341174f20162a2bbb3ce357ab
parent420ed0442de569087c738d9ee84c324b17e4a3db
parent4482c9e4b68bc6c38ee954add1603b9cdb131843
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