diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-24 05:37:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-24 05:37:23 (GMT) |
| commit | 98ee8187e4e331716be0797169ba9ddbb26efe56 (patch) | |
| tree | a4ee87b74fd3c6050e91537314c12c069929e5cc /Documentation | |
| parent | 072570ee2689c5f19513157d654f04f5a7113a24 (diff) | |
| parent | a21f0f0a22c513130f1268e3296dd52d47d2f0e0 (diff) | |
| download | git-98ee8187e4e331716be0797169ba9ddbb26efe56.zip git-98ee8187e4e331716be0797169ba9ddbb26efe56.tar.gz git-98ee8187e4e331716be0797169ba9ddbb26efe56.tar.bz2 | |
Merge branch 'maint'
* maint:
Fix possible coredump with fast-import --import-marks
Refactor fast-import branch creation from existing commit
fast-import: Fix crash when referencing already existing objects
fast-import: Fix uninitialized variable
Documentation: fix git-config.xml generation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index eb2e79a..3d8f03d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -281,7 +281,7 @@ apply.whitespace:: as the '--whitespace' option. See gitlink:git-apply[1]. branch.autosetupmerge:: - Tells `git-branch' and `git-checkout' to setup new branches + Tells `git-branch` and `git-checkout` to setup new branches so that gitlink:git-pull[1] will appropriately merge from that remote branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` |