diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:00:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:00:43 -0800 |
| commit | 0ebd5d7186237663a642397214232e5fe2fba21d (patch) | |
| tree | c94682d4abf341bdc6df2785b73faa6e796ff045 /Documentation | |
| parent | 5b0d61637c21d80bcc781aa135ed1959326713bb (diff) | |
| parent | cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5 (diff) | |
| download | git-0ebd5d7186237663a642397214232e5fe2fba21d.tar.gz git-0ebd5d7186237663a642397214232e5fe2fba21d.tar.xz | |
Merge branch 'js/pull-rebase'
* js/pull-rebase:
Teach 'git pull' about --rebase
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-pull.txt | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 39d1ef529..4124ad297 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -346,6 +346,13 @@ branch.<name>.mergeoptions:: option values containing whitespace characters are currently not supported. +branch.<name>.rebase:: + When true, rebase the branch <name> on top of the fetched branch, + instead of merging the default branch from the default remote. + *NOTE*: this is a possibly dangerous operation; do *not* use + it unless you understand the implications (see gitlink:git-rebase[1] + for details). + clean.requireForce:: A boolean to make git-clean do nothing unless given -f or -n. Defaults to true. diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e1eb2c1d0..d4d26afea 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -33,6 +33,16 @@ include::urls-remotes.txt[] include::merge-strategies.txt[] +\--rebase:: + Instead of a merge, perform a rebase after fetching. + *NOTE:* This is a potentially _dangerous_ mode of operation. + It rewrites history, which does not bode well when you + published that history already. Do *not* use this option + unless you have read gitlink:git-rebase[1] carefully. + +\--no-rebase:: + Override earlier \--rebase. + DEFAULT BEHAVIOUR ----------------- |