Git Octopus Merge

alfa and beta branches are checked out from master branch. In branch beta a file named beta.txt was created and committed. The listing shows creating and committing alfa.txt and octopus merging.

$ git checkout alfa 
Switched to branch 'alfa' 

josh@SMARTBOX ~/Documents/git/developer (alfa) 
$ vim alfa.txt 

josh@SMARTBOX ~/Documents/git/developer (alfa) 
$ git add . 

josh@SMARTBOX ~/Documents/git/developer (alfa) 
$ git commit -m 'added alfa.txt' 
[alfa d30de0e] added alfa.txt 
1 file changed, 1 insertion(+) 
create mode 100644 alfa.txt 

josh@SMARTBOX ~/Documents/git/developer (alfa) 
$ git checkout master 
Switched to branch 'master' 
Your branch is up-to-date with 'origin/master'. 

josh@SMARTBOX ~/Documents/git/developer (master) 
$ git merge alfa beta 
Fast-forwarding to: alfa 
Trying simple merge with beta 
Merge made by the 'octopus' strategy. 
alfa.txt | 1 + 
beta.txt | 1 + 
2 files changed, 2 insertions(+) 
create mode 100644 alfa.txt 
create mode 100644 beta.txt

Files alfa.txt and beta.txt that were created in their branches are now in master branch.