Merging Branches - Git Recipes - page 223

All three languages—RegExp, SQL, and PHP—use the same escaping character,
which is a backslash ( \) . Thus one backslash is encoded as eight backslashes!
6-6. Avoiding a fast-forward merge
Problem
Your repository looks like Figure 6-2 . You want to merge the branch feature into
the master in such a way that the history looks like Figure 6-11 . You want all the re-
visions from the feature branch to be grouped visually in a bulb.
Figure 6-11 . The result of merging the feature branch into the master branch using the --no-ff option
Solution
Clone the repository from Recipe 6-1 with branches:
$ cd git-recipes
$ git clone-with-branches 06-01 06-06
$ cd 06-06
and then merge the feature branch with:
$ git merge --no-ff feature