Terminology

git branch —merged List branches that are already merged into current branch.

git branch —no-merged List branches that have not been merged into current branch.

git merge Join two or more development histories together.

Facts, Thoughts and Opinions

Git Commit and Merge Master

git checkout master
git pull
git checkout -
git merge master

git pull

git pull <remote> <branch> = git fetch <remote> <branch>; git merge FETCH_HEAD;

Git: Rebase versus merge

Git rebase followed by git merge with fast-forward produces the same result as a git merge. The difference is a cleaner history. If you examine the log of a rebased branch, it looks like a linear history: it appears that all the work happened in series, even when it originally happened in parallel.

Images

[[/div]]
  •   Subtopics

  •   Writings

  Sources & Bookmarks