diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:34:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:34:19 -0700 |
| commit | 871e293c9acbeaacce59dcd98fab6028f552f5be (patch) | |
| tree | c363ffb2dcced8d6e8057e31c5d7378508205c50 /Documentation/git-pull.txt | |
| parent | fab4b04e4be5ccfdf93e21e7260040bd9e7faedd (diff) | |
| parent | b52183179bb0a97ea4d91d1248aca303d8e8f892 (diff) | |
| download | git-871e293c9acbeaacce59dcd98fab6028f552f5be.tar.xz | |
Merge branch 'maint-1.7.11' into maint
* maint-1.7.11:
Prepare for 1.7.11.6
Make the ciabot scripts completely self-configuring in the normal case.
Improved documentation for the ciabot scripts.
man: git pull -r is a short for --rebase
gitcli: describe abbreviation of long options
rev-list docs: clarify --topo-order description
Documentation/CodingGuidelines: spell out more shell guidelines
Documentation: do not mention .git/refs/* directories
tests: Introduce test_seq
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index defb544ed0..67fa5ee195 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -101,6 +101,7 @@ include::merge-options.txt[] :git-pull: 1 +-r:: --rebase:: Rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to |