diff options
| author | Nicolas Pitre <nico@cam.org> | 2007-01-15 03:44:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-15 05:12:14 (GMT) |
| commit | c14261eaa297504799e3b21ecbd751edbae912c0 (patch) | |
| tree | 26729b99c1fdc3549bdc12aef9c3e8d55eb59983 /Documentation/git-pull.txt | |
| parent | adb7ba6b116c0ec26e058b9b41a5a528d123323f (diff) | |
| download | git-c14261eaa297504799e3b21ecbd751edbae912c0.zip git-c14261eaa297504799e3b21ecbd751edbae912c0.tar.gz git-c14261eaa297504799e3b21ecbd751edbae912c0.tar.bz2 | |
some doc updates
1) talk about "git merge" instead of "git pull ."
2) suggest "git repo-config" instead of directly editing config files
3) echo "URL: blah" > .git/remotes/foo is obsolete and should be
"git repo-config remote.foo.url blah"
4) support for partial URL prefix has been removed (see commit
ea560e6d64374ec1f6c163c276319a3da21a1345) so drop mention of it.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 13be992..a90b764 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -52,7 +52,8 @@ git pull origin next:: git pull . fixes enhancements:: Bundle local branch `fixes` and `enhancements` on top of - the current branch, making an Octopus merge. + the current branch, making an Octopus merge. This `git pull .` + syntax is equivalent to `git merge`. git pull -s ours . obsolete:: Merge local branch `obsolete` into the current branch, |