X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=7578623edba9e2ddc5232f1a981bcb297182638d;hb=42fc11c1103a88c49233f04dc0c2f5659b3973fe;hp=d9537ebc6a8df5311275965eb62ca106566a7f8c;hpb=7dde4bb3674da53dd9e33c741bea3fe680690a0d;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index d9537ebc6..7578623ed 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -13,16 +13,16 @@ SYNOPSIS DESCRIPTION ----------- -Runs `git-fetch` with the given parameters, and calls `git-merge` +Runs 'git-fetch' with the given parameters, and calls 'git-merge' to merge the retrieved head(s) into the current branch. -With `--rebase`, calls `git-rebase` instead of `git-merge`. +With `--rebase`, calls 'git-rebase' instead of 'git-merge'. Note that you can use `.` (current directory) as the to pull from the local repository -- this is useful when merging local branches into the current branch. -Also note that options meant for `git-pull` itself and underlying -`git-merge` must be given before the options meant for `git-fetch`. +Also note that options meant for 'git-pull' itself and underlying +'git-merge' must be given before the options meant for 'git-fetch'. OPTIONS ------- @@ -182,7 +182,7 @@ The final command then merges the newly fetched `tmp` into master. If you tried a pull which resulted in a complex conflicts and -would want to start over, you can recover with `git-reset`. +would want to start over, you can recover with 'git-reset'. SEE ALSO @@ -193,7 +193,7 @@ linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1] Author ------ Written by Linus Torvalds -and Junio C Hamano +and Junio C Hamano Documentation --------------