This link has been bookmarked by 310 people . It was first bookmarked on 06 Apr 2008, by xinran zhou.
-
04 Feb 13
-
14 Jan 13
-
15 Nov 12
-
if you have uncommitted changes touching the same files as the ones impacted by the merge, Git will refuse to proceed
-
Most of the time, you will want to commit your changes before you can merge, and if you don’t, then git-stash(1) can take these changes away while you’re doing the merge, and reapply them afterwards.
-
-
20 Sep 12
Jochen FrommRTFM or TL;DR ? (for version 1.5.3 or newer)
git manual reference documentation development programming versioncontrol scm
-
01 Jan 12
-
27 Sep 11
-
06 Sep 11
-
12 Aug 11
-
03 Aug 11
-
15 Jul 11
-
10 Jun 11
-
11 May 11
-
05 May 11
-
01 May 11
-
28 Apr 11
-
27 Apr 11
-
14 Apr 11
-
02 Apr 11
-
26 Mar 11
-
03 Mar 11
-
09 Feb 11
-
30 Jan 11
-
24 Jan 11
-
06 Jan 11
-
04 Jan 11
-
21 Dec 10
-
09 Dec 10
-
03 Dec 10
-
29 Nov 10
-
20 Nov 10
-
19 Nov 10
-
17 Nov 10
-
30 Oct 10
-
28 Oct 10
-
28 Sep 10
-
23 Aug 10
-
12 Aug 10
-
31 Jul 10
-
25 Jul 10
-
24 Jun 10
-
31 May 10
-
20 May 10
-
14 May 10
-
04 May 10
-
29 Apr 10
-
22 Apr 10
-
20 Apr 10
-
18 Apr 10
-
14 Apr 10
-
Git User's Manual (for version 1.5.3 or newer)
-
-
05 Apr 10
-
26 Mar 10
-
22 Mar 10
-
28 Feb 10
-
24 Feb 10
-
Time goes left to right
-
nstead, work may simultaneously proceed along parallel lines of development, called branches,
-
parallel lines of development, called branches,
-
"branch" to mean a line of development, and "branch head" (or just "head") to mean a reference to the most recent commit on a branch.
-
parallel lines of development, called branches,
-
Understanding history: History diagrams
-
create a new branch <new> referencing <start-point>, and check it out.
-
$ git checkout v2.6.17
-
This is an easy way to check out a particular version without having to make up a name for the new branch. You can still create a new branch (or tag) for this version later if you decide to.
-
$ git branch -r
-
- The branch "test" is short for "refs/heads/test".
- The tag "v2.6.18" is short for "refs/tags/v2.6.18".
-
origin/master" is short for "refs/remotes/origin/master
-
Updating a repository with git fetch
-
The command "git fetch", with no arguments, will update all of the remote-tracking branches to the latest version found in her repository.
-
-
23 Feb 10
-
15 Feb 10
-
14 Feb 10
-
04 Feb 10
-
21 Jan 10
-
19 Jan 10
-
13 Jan 10
-
12 Jan 10
-
11 Jan 10
-
07 Jan 10
-
06 Jan 10
-
16 Dec 09
-
15 Dec 09
-
01 Dec 09
-
19 Nov 09
-
13 Nov 09
-
11 Nov 09
-
10 Nov 09
-
02 Nov 09
David Fisherrefspec
A "refspec" is used by fetch and push to describe the mapping between remote ref and local ref. They are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, +. For example: git fetch $URL refs/heads/master:refs/ -
05 Oct 09
-
04 Oct 09
-
02 Oct 09
-
29 Sep 09
-
28 Sep 09
-
23 Sep 09
-
21 Sep 09
-
-
How to get a git repository
-
Examining branches from a remote repository
-
Getting updates with git pull
-
Git is best thought of as a tool for storing the history of a collection of files. It stores the history as a compressed collection of interrelated snapshots of the project's contents. In git each such version is called a commit.
-
work may simultaneously proceed along parallel lines of development, called branches, which may merge and diverge.
-
It does this by keeping a list of heads which reference the latest commit on each branch;
-
Most projects also use tags. Tags, like heads, are references into the project's history, and can be listed using the git-tag(1) command:
-
The "master" branch that was created at the time you cloned is a copy of the HEAD in the repository that you cloned from. That repository may also have had other branches, though, and your local repository keeps branches which track each of those remote branches, which you can view using the "-r" option to git-branch(1):
-
After you clone a repository and make a few changes of your own, you may wish to check the original repository for updates and merge them into your own work.
We have already seen how to keep remote tracking branches up to date with git-fetch(1), and how to merge two branches. So you can merge in changes from the original repository's master branch with:
$ git fetch
$ git merge origin/masterHowever, the git-pull(1) command provides a way to do this in one step:
$ git pull origin master
In fact, if you have "master" checked out, then by default "git pull" merges from the HEAD branch of the origin repository. So often you can accomplish the above with just a simple
$ git pull
-
-
06 Sep 09
-
23 Aug 09
-
20 Aug 09
-
31 Jul 09
-
28 Jul 09
-
21 Jul 09
-
16 Jul 09
-
10 Jul 09
-
08 Jul 09
Would you like to comment?
Join Diigo for a free account, or sign in if you are already a member.