Salutations everyone,

I have been working on a bash script as a small summer project to learn more about UNIX scripting and on using git.

This has been the first time that I have used branches in git, normally I just stick to master.

I was viewing the git log with the graph (git log --graph) when I noticed that my 'develop' branch seemed to have merged with 'master'. Something like this:

master   ----1--------3----4----5----6----HEAD
develop      \---2---/

but commits 3 onwards were done within the develop branch. Doing git checkout master and git checkout develop showed this to be true.

What exactly is going on? Is this what is known as fast-forwarding?

P.S.: Commits 1 and 2 are also a mystery to me being that commit 2 is actually an amendment of commit 1 (as far I thought, I used this advice)