Skip to content

Instantly share code, notes, and snippets.

@dfabulich
Created August 24, 2017 04:23
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save dfabulich/bdf255742fa79953f79486533204e23b to your computer and use it in GitHub Desktop.
Save dfabulich/bdf255742fa79953f79486533204e23b to your computer and use it in GitHub Desktop.
#!/bin/bash -e
rm -rf example
git init example
cd example
cat > file.txt << EOF
0
0
0
0
0
0
0
0
0
0
0
0
EOF
git add file.txt
git commit -am "initial"
git branch branch1
git branch branch2
git branch branch3
cat > file.txt << EOF
master
0
0
0
0
0
0
0
0
0
0
0
EOF
sleep 1
git commit -am "commit directly on master"
git checkout branch1
cat > file.txt << EOF
0
0
0
branch1
0
0
0
0
0
0
0
0
EOF
sleep 1
git commit -am "branch 1"
git checkout branch2
cat > file.txt << EOF
0
0
0
0
0
0
branch2
0
0
0
0
0
EOF
sleep 1
git commit -am "branch 2"
git checkout master
sleep 1
git merge --no-edit branch2
git checkout branch3
cat > file.txt << EOF
0
0
0
0
0
0
0
0
0
0
0
branch3
EOF
sleep 1
git commit -am "branch 3"
git checkout master
sleep 1
git merge --no-edit branch1
sleep 1
git merge --no-edit branch3
git log --pretty="format:%h %ar %s"
git log --pretty="format:%h %ar %s" --graph
git log --pretty="format:%h %ar %s" --first-parent
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment