Programmer's Notebook

Merge branches in Git Few days ago, my superior gave a task to make a presentation about the daily usage of git for R&D department, so I resumed the git pro book to prepare this presentation. And the following article is to recognize my former wrong and unclear opinion about branch merging in git, and a little suggestion about branch management. So how to merge two branches? There are two methods to merge two branches, merge and rebase. Merge method is to merge two branch and generate a new commitment, whose parents are the two HEAD of the older branch. This is called a cross in the branch network. While the rebase method is to re-play every commitment of a branch to another branch, and there are no cross between them after two branch's rebase. And the best way to check the branches is working in right way is to check if there are crosses in branches. So the recommended method of combine two branches is to always use rebase instead of the merge. Because If you always u...

Practise Git Table of Contents What's git? Daily Usage 1 What's git? Git, initially started by Linus, is a most advanced distributed version control system. The another kinds of version control system are centralized version control system, SVN is one of them. 2 Daily Usage you wanna stage a file git add file untrack(unstage) a file git reset HEAD file get a diff between staged area and unstaged area git diff get a diff between staged area and last commitment git diff --cached commit staged area into the repository git commit push to the last commitment into the remote repository git push [remote-name] [branch-name] git push [remote-name] [locale-branch]:[remote-branch] remove staged file git rm file # or git reset HEAD file rm file turn back to former status git checkout -- file get a list of all remote repository git remote -v add a remote repository git remote add [shortnam...