diff options
| author |  Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2010-11-12 19:55:58 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:17:46 -0800 |
| commit | 11fe3f73cce13b759a728b0a9ac95e745470f251 (patch) | |
| tree | 68bf9488e64c3c55e38d5e86dbbb4a4312ffd8a7 /contrib/fast-import/git-p4.txt | |
| parent | Document that rev-list --graph triggers parent rewriting. (diff) | |
| download | tgif-11fe3f73cce13b759a728b0a9ac95e745470f251.tar.xz | |
Documentation/git-pull: clarify configuration
The sentence about 'branch.<name>.rebase' refers to the first sentence
in the paragraph and not to the sentence about avoiding rebasing
non-local changes. Clarify this.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import/git-p4.txt')
0 files changed, 0 insertions, 0 deletions