GIT is a version control software used to maintain our group codes. There is lots of GIT information on the web. Check the following links for starters:
A fast-forward merge can occur when there is a linear path from the current branch tip to the target branch. Instead of “actually” merging the branches, all Git has to do to integrate the histories is move (i.e., “fast forward”) the current branch tip up to the target branch tip. This effectively combines the histories, since all of the commits reachable from the target branch are now available through the current one.
rebasing is the process of moving a branch to a new base commit.
http://git-scm.com/
Everyday GIT
http://gitref.org/
https://www.atlassian.com/git/
GIT Terminology
A fast-forward merge can occur when there is a linear path from the current branch tip to the target branch. Instead of “actually” merging the branches, all Git has to do to integrate the histories is move (i.e., “fast forward”) the current branch tip up to the target branch tip. This effectively combines the histories, since all of the commits reachable from the target branch are now available through the current one.
rebasing is the process of moving a branch to a new base commit.