git terminal

CLI (or Linux) users when they found out not everyone uses CLI (they dislike using GUI)

No offence, but I also use SmartGit beside your ol' Git (you should tell them, GUI for Git exists). I know enough how Git works and knows how to do it in the command prompt, but my workflow would be easier when I use the GUI. It's fine for me.

Anyways, creating a branch and merging it is simple.

git branch patch-1
git checkout patch-1
echo "Test file" > test.txt
git add .
git commit -m "Add test file"
git checkout master
git merge patch-1