diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
| commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
| tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-pull.txt | |
| parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
| download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/git-pull.txt b/git-pull.txt index b93201158..31f42ea21 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -13,16 +13,20 @@ 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 <repository> 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'. + +*Warning*: Running 'git pull' (actually, the underlying 'git merge') +with uncommitted changes is discouraged: while possible, it leaves you +in a state that is hard to back out of in the case of a conflict. OPTIONS ------- @@ -148,7 +152,7 @@ $ git merge origin/next 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 |