diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-03 22:14:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 23:05:34 -0800 |
| commit | d77ee72662a821d66ae218056f0103eb24d8d4b4 (patch) | |
| tree | e22abdbd11735a0669362f934ae723d233c87e2b /Documentation/git-pull.txt | |
| parent | eb8381c88518b10d683a29deea1d43ed671f14ec (diff) | |
| parent | 8d0fc48f27304ac1bc7abf802ec53fe66fedb15a (diff) | |
| download | git-d77ee72662a821d66ae218056f0103eb24d8d4b4.tar.gz | |
Merge branch 'master' into np/dreflog
This is to resolve conflicts early in preparation for possible
inclusion of "reflog on detached HEAD" series by Nico, as having
it in 1.5.0 would really help us remove confusion between
detached and attached states.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 3e5f115728..a81d68ccef 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -42,7 +42,7 @@ git pull, git pull origin:: current branch. Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and - branch.<name>.merge options; see gitlink:git-repo-config[1] + branch.<name>.merge options; see gitlink:git-config[1] for details. git pull origin next:: @@ -94,7 +94,7 @@ gitlink:git-reset[1]. SEE ALSO -------- -gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-repo-config[1] +gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-config[1] Author |