X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull.txt;h=7578623edba9e2ddc5232f1a981bcb297182638d;hb=e80f97e20c8122f79450e1f40f569df0b52773e9;hp=c731bdc07e0118dd12a30bb2e3c3513bd8e24803;hpb=1e040c0b0577b3de0006f43daa71bfe7ad7532c0;p=git.git diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index c731bdc07..7578623ed 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -8,21 +8,21 @@ git-pull - Fetch from and merge with another repository or a local branch SYNOPSIS -------- -'git-pull' ... +'git pull' ... 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,8 +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 -linkgit:git-reset[1]. +would want to start over, you can recover with 'git-reset'. SEE ALSO