Note: the original website address in here

Rebase command

A rebase is an alternative to a merge for combining multiple branches. Whereas a merge creates a single commit with two parents, leaving a non-linear history, a rebase replays the commits from the current branch onto another, leaving a linear history. In essence, this is an automated way of performing several cherry-picks in a row.

Note: the original website address in here

Merge command

A merge creates a new commit that incorporates changes from other commits. Before merging, the stage must match the current commit. The trivial case is if the other commit is an ancestor of the current commit, in which case nothing is done. The next most simple is if the current commit is an ancestor of the other commit. This results in a fast-forward merge. The reference is simply moved, and then the new commit is checked out.

Note: the original website address is here

Diff Command

There are various ways to look at differences between commits. Below are some common examples. Any of these commands can optionally take extra filename arguments that limit the differences to the named files.

Note: the original website address in here

Commit command

When you commit, git creates a new commit object using the files from the stage and sets the parent to the current commit. It then points the current branch to this new commit. In the image below, the current branch is master. Before the command was run, master pointed to ed489. Afterward, a new commit, f0cec, was created, with parent ed489, and then master was moved to the new commit.

Note: the original website address in here Cherry-pick commandThe cherry-pick command “copies” a commit, creating a new

Note: the original website address in here

Checkout

The checkout command is used to copy files from the history (or stage) to the working directory, and to optionally switch branches.

When a filename (and/or -p) is given, git copies those files from the given commit to the stage and the working directory. For example, git checkout HEAD~ foo.c copies the file foo.c from the commit called HEAD~ (the parent of the current commit) to the working directory, and also stages it. (If no commit name is given, files are copied from the stage.) Note that the current branch is not changed.

Note: the original website address is here

Conventions

Note: the original website address is here

Basic Usage

The four commands above copy files between the working directory, the stage (also called the index), and the history (in the form of commits).

Redo Commits

• Undo all commits after [commit], and preserve changes locally:
  $ git reset [commit]

• Discard all history and changes back to the specified commit:
  $ git reset --hard [commit]

Group Changes

• List all local branches in the current repository:
  $ git branch

• Create a new branch with specified name:
  $ git branch [branch-new]

• Switch to the specified branch and updates the working directory:
  $ git checkout [branch-name]

• Combine the specified branch to the current branch:
  $ git merge [branch-name]

• Delete the specified branch:
  $ git branch -d [branch-name]