Commit 7eae946b authored by Leena Miettinen's avatar Leena Miettinen

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's avatarOrgad Shaneh <orgads@gmail.com>
parent 3ace5440
......@@ -481,6 +481,12 @@
\row
\li \gui Merge
\li Join the development histories in two branches together.
If the commit you are merging can be reached by following the
first commit's history, there is no divergent work to merge
together. To allow Git to move the branch pointer forward,
select \gui {Fast-Forward}. If you do not want to fast-forward
the branch, select \gui {No Fast-Forward}.
\row
\li \gui Rebase
\li Copy local commits to the updated upstream head.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment