#!/bin/sh
git init
touch toto
echo "-----------------" >> toto
echo "- toto file">> toto
echo "-----------------" >> toto
touch tata
echo "-----------------" >> tata
echo "- tata file">> tata
echo "-----------------" >> tata
git add toto tata
git commit -m "Initial commit"
echo "echo toto" >> toto
echo "echo tata" >> tata
git commit -am "Add content to file"
git checkout -b headers
echo "#EOF" >> toto
git add toto
git rm tata
git commit -m "Add EOF and remove tata"
git checkout master
touch tutu
echo "-----------------" >> tutu
echo "- tutu file">> tutu
echo "-----------------" >> tutu
git add tutu
git commit -m "Add tutu file"
git merge -m "Merge from headers branch" headers
echo "#EOF" >> tutu
git add tutu
git commit -m "Add EOF"
git status
ls
#EOF