diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-23 14:56:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-23 14:56:38 -0700 |
| commit | 238ce9c29632ff8714caddd1e0aee4f837ed3a30 (patch) | |
| tree | f07942a6a58dfb0cdf4ca1a5143537f7c5c84083 /config.txt | |
| parent | aef76445eb91513ca7684bdd5a80ecfef32ae40e (diff) | |
| download | git-htmldocs-238ce9c29632ff8714caddd1e0aee4f837ed3a30.tar.gz | |
Autogenerated HTML docs for v1.8.4.1-600-g3d092
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config.txt b/config.txt index d4d93c973..ab26963d6 100644 --- a/config.txt +++ b/config.txt @@ -724,6 +724,8 @@ branch.<name>.remote:: overridden by `branch.<name>.pushremote`. If no remote is configured, or if you are not on any branch, it defaults to `origin` for fetching and `remote.pushdefault` for pushing. + Additionally, `.` (a period) is the current local repository + (a dot-repository), see `branch.<name>.merge`'s final note below. branch.<name>.pushremote:: When on branch <name>, it overrides `branch.<name>.remote` for @@ -749,8 +751,8 @@ branch.<name>.merge:: Specify multiple values to get an octopus merge. If you wish to setup 'git pull' so that it merges into <name> from another branch in the local repository, you can point - branch.<name>.merge to the desired branch, and use the special setting - `.` (a period) for branch.<name>.remote. + branch.<name>.merge to the desired branch, and use the relative path + setting `.` (a period) for branch.<name>.remote. branch.<name>.mergeoptions:: Sets default options for merging into branch <name>. The syntax and |