#### Git Commits A commit in a git repository records a snapshot of all the (tracked) files in your directory. ##### Git Branches Branches in git are simply pointers to a specific commit -- nothing more. ##### Git Merge Merging is one of two ways in git of combining the work from two different branches together. Merging in Git creates a special commit that has two unique parents (e.g., all the work from this parent over here and this one over here, and the set of all their parents). ##### Git Rebase The second way of combining work between branches is _rebasing._ Rebasing essentially takes a set of commits, "copies" them, and plops them down somewhere else. The advantage of rebasing is that it can be used to make a nice linear sequence of commits. The commit log / history of the repository will be a lot cleaner if only rebasing is allowed. ___ **Tags**: