git fast-forward example

git_f-f_for_faheem.sh

# create repo
git init

# set up branch stuck_on_foo with a single commit
touch foo
git add foo
git commit -m 'foo'
git branch stuck_on_foo

# add another commit to master
touch bar
git add bar 
git commit -m 'bar'

# go back to stuck_on_foo and merge master into it to witness a fast-forward
git checkout stuck_on_foo 
#gittree is an alias I have for this from https://stackoverflow.com/a/35075021:
git log --all --oneline --graph --decorate --branches
git merge master  # the fast-forward
git log --all --oneline --graph --decorate --branches