Doc: merging with Git fast-forward option
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 <2b010cbad792a0c0a8175f752f93f83941fc6bc1@gmail.com>

maui-packages/qt-creator,danimo/qt-creator,farseerri/git_code,xianian/qt-creator,danimo/qt-creator,martyone/sailfish-qtcreator,maui-packages/qt-creator,danimo/qt-creator,Distrotech/qtcreator,farseerri/git_code,xianian/qt-creator,Distrotech/qtcreator,omniacreator/qtcreator,maui-packages/qt-creator,AltarBeastiful/qt-creator,maui-packages/qt-creator,omniacreator/qtcreator,AltarBeastiful/qt-creator,kuba1/qtcreator,martyone/sailfish-qtcreator,colede/qtcreator,danimo/qt-creator,Distrotech/qtcreator,maui-packages/qt-creator,farseerri/git_code,colede/qtcreator,farseerri/git_code,xianian/qt-creator,martyone/sailfish-qtcreator,AltarBeastiful/qt-creator,AltarBeastiful/qt-creator,farseerri/git_code,xianian/qt-creator,martyone/sailfish-qtcreator,farseerri/git_code,danimo/qt-creator,danimo/qt-creator,amyvmiwei/qt-creator,martyone/sailfish-qtcreator,kuba1/qtcreator,Distrotech/qtcreator,omniacreator/qtcreator,amyvmiwei/qt-creator,colede/qtcreator,xianian/qt-creator,danimo/qt-creator,colede/qtcreator,kuba1/qtcreator,xianian/qt-creator,xianian/qt-creator,amyvmiwei/qt-creator,maui-packages/qt-creator,omniacreator/qtcreator,kuba1/qtcreator,darksylinc/qt-creator,darksylinc/qt-creator,kuba1/qtcreator,kuba1/qtcreator,danimo/qt-creator,danimo/qt-creator,martyone/sailfish-qtcreator,farseerri/git_code,colede/qtcreator,maui-packages/qt-creator,amyvmiwei/qt-creator,omniacreator/qtcreator,Distrotech/qtcreator,darksylinc/qt-creator,kuba1/qtcreator,darksylinc/qt-creator,farseerri/git_code,darksylinc/qt-creator,martyone/sailfish-qtcreator,amyvmiwei/qt-creator,colede/qtcreator,amyvmiwei/qt-creator,xianian/qt-creator,martyone/sailfish-qtcreator,kuba1/qtcreator,AltarBeastiful/qt-creator,colede/qtcreator,omniacreator/qtcreator,omniacreator/qtcreator,AltarBeastiful/qt-creator,xianian/qt-creator,kuba1/qtcreator,darksylinc/qt-creator,amyvmiwei/qt-creator,amyvmiwei/qt-creator,darksylinc/qt-creator,Distrotech/qtcreator,darksylinc/qt-creator,martyone/sailfish-qtcreator,AltarBeastiful/qt-creator,AltarBeastiful/qt-creator,Distrotech/qtcreator