Merge branch 'fc/update' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 21:03:45 +0000 (16:03 -0500)
commitea15f43ebc0e4253630c7205625184ed3f70789d
tree3e0bb4a838a03e7515b72ec7da19d722ded71af4
parente58a983e1846d947b90ddae8cdc1e39a178d2041
parentb2225d000eed9d4fdb0c5d421dbdd91a739767a9
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