diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-20 10:44:26 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-20 10:44:26 +0000 |
commit | 6d559fc736bece9bac0d731b496639cbfe9ef757 (patch) | |
tree | 8a7cc77ae892f0ec22f260edc8bd452f06390d48 /git-pull.txt | |
parent | e670d0d6241cf484903e1d98bf786b58657c98e2 (diff) | |
download | git-htmldocs-6d559fc736bece9bac0d731b496639cbfe9ef757.tar.gz |
Autogenerated HTML docs for v1.5.4.2-156-ge3c5
Diffstat (limited to 'git-pull.txt')
-rw-r--r-- | git-pull.txt | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/git-pull.txt b/git-pull.txt index 179bdfc69..737894390 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -15,6 +15,7 @@ DESCRIPTION ----------- 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`. Note that you can use `.` (current directory) as the <repository> to pull from the local repository -- this is useful @@ -26,19 +27,14 @@ OPTIONS include::merge-options.txt[] :git-pull: 1 -include::fetch-options.txt[] - -include::pull-fetch-param.txt[] - -include::urls-remotes.txt[] - -include::merge-strategies.txt[] \--rebase:: Instead of a merge, perform a rebase after fetching. If there is a remote ref for the upstream branch, and this branch was rebased since last fetched, the rebase uses that information - to avoid rebasing non-local changes. + to avoid rebasing non-local changes. To make this the default + for branch `<name>`, set configuration `branch.<name>.rebase` + to `true`. + *NOTE:* This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you @@ -48,6 +44,14 @@ unless you have read linkgit:git-rebase[1] carefully. \--no-rebase:: Override earlier \--rebase. +include::fetch-options.txt[] + +include::pull-fetch-param.txt[] + +include::urls-remotes.txt[] + +include::merge-strategies.txt[] + DEFAULT BEHAVIOUR ----------------- |