diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:54:25 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-08-30 16:54:25 -0700 |
commit | 7a031e5c8c444cac4c199ecf6538eb89f8862071 (patch) | |
tree | bef184dc029d8342f45d83bace3deeedae0e6b7b /git-pull.txt | |
parent | d2e30562620c9dda7b685f4d3bcb8acab537d97c (diff) | |
download | git-htmldocs-7a031e5c8c444cac4c199ecf6538eb89f8862071.tar.gz |
Autogenerated HTML docs for v2.33.0-113-g6c408
Diffstat (limited to 'git-pull.txt')
-rw-r--r-- | git-pull.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/git-pull.txt b/git-pull.txt index 7f4b2d198..aef757ec8 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -15,14 +15,17 @@ SYNOPSIS DESCRIPTION ----------- -Incorporates changes from a remote repository into the current -branch. In its default mode, `git pull` is shorthand for -`git fetch` followed by `git merge FETCH_HEAD`. - -More precisely, 'git pull' runs 'git fetch' with the given -parameters and calls 'git merge' to merge the retrieved branch -heads into the current branch. -With `--rebase`, it runs 'git rebase' instead of 'git merge'. +Incorporates changes from a remote repository into the current branch. +If the current branch is behind the remote, then by default it will +fast-forward the current branch to match the remote. If the current +branch and the remote have diverged, the user needs to specify how to +reconcile the divergent branches with `--rebase` or `--no-rebase` (or +the corresponding configuration option in `pull.rebase`). + +More precisely, `git pull` runs `git fetch` with the given parameters +and then depending on configuration options or command line flags, +will call either `git rebase` or `git merge` to reconcile diverging +branches. <repository> should be the name of a remote repository as passed to linkgit:git-fetch[1]. <refspec> can name an @@ -132,7 +135,7 @@ published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully. --no-rebase:: - Override earlier --rebase. + This is shorthand for --rebase=false. Options related to fetching ~~~~~~~~~~~~~~~~~~~~~~~~~~~ |