Doc: merging with Git fast-forward option

If fast-forwarding is possible, you can select whether to do
it or not.

Change-Id: Idd97793da496cbfbb600517bf278660687cc7520
Reviewed-by: Orgad Shaneh <orgads@gmail.com>