Fix multiple fast-forward error

Fixed #37. Thanks @danoliv!

Fix fast forward logic

Fixes #34. Thank you @danoliv !

Go rewrite - beta.1

Changes

Here's the first go build of git-octopus ! Note that all features haven't been ported yet but it would be cool to test it before going any further.

This version includes everything except:

• Chunk mode
• Conflict resolutions. This means that git-conflict is not available and git-octopus doesn't use recorded conflict (from a previous git-conflict use).

Update from 1.x

Download manually the binary corresponding to your OS, rename it to git-octopus, and replace $(which git-octopus) with it.

New installation

Pick the binary that suits your OS, rename it to git-octopus and add it to the $PATH

Test the installation

git octopus -v should output 2.0

v1.4

• git-octopus now accept excluding patterns. See git-octopus @ozangunalp
• Fixed an issue that caused git-octopus to create an empty commit when there was nothing to merge. #16

git-octopus now requires git >= 1.8 (released around may 2013)

Chunk mode

• Added -s option on git octopus to activate the chunk mode. The merge is then performed by subsets of branches. This is meant to help reading the log graph when lots of branches are merged. @benba
• git conflict can now be run in detached mode. @apflieger
• Huge performance improvement on octopus that has conflicts on large files. @benba

Many thanks @benba for your contributions :)

Doc improvement

Improved the documentation of git-conflict

1.2

• Added -c option to git octopus that allow to override octopus.commit = false config. This is particularly useful when the continuous integration computed an octopus merge that doesn't compile and you want to investigate in local. See git-octopus for more details.
• Fixed the html documentation installation for the homebrew installation.
• Improved repository cleanup when interrupting git octopus.
• Dropped the support of running with untracked files. git octopus now refuses to start.

Minor fix on make install

Fixed installation procedure that broke too easily

A first step to conflict resolution

This release includes two major things :

• A new command git conflict
• A simplier way to install git-octopus from sources using make

Note for users of the previous version (1.0) :

Remove the bin/ directory of the project from the PATH.This was the old way to install it, it's no longer required.

git conflict is a first step towards the main goal of the project right now which is to make conflict management simple enough so nobody has to rebase/merge feature branches with one another anymore in an octopus based workflow.

First release !

v1.0

Update REAME.md