| commit | 11fe3f73cce13b759a728b0a9ac95e745470f251 | |
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Fri, 12 Nov 2010 18:55:58 +0000 (12 19:55 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 21:17:46 +0000 (17 13:17 -0800) | ||
| tree | 68bf9488e64c3c55e38d5e86dbbb4a4312ffd8a7 | treesnapshot (tar.gz zip) |
| parent | 6a6c54bafed84220bcd09b19b40c104d1ff687cc | commitdiff |
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>
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>
| Documentation/git-pull.txt | diffblobblamehistory |