diff options
| author | Philip Oakley <philipoakley@iee.org> | 2013-09-13 22:23:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-13 15:30:01 -0700 |
| commit | b85ecea625cb990ce9f02793a69fb339bb467e6c (patch) | |
| tree | 009d3ba58047b40071c513db1041b6c199b6c38f /Documentation/config.txt | |
| parent | 431260cc8dda69336ced159c39d10007c9584e58 (diff) | |
| download | git-b85ecea625cb990ce9f02793a69fb339bb467e6c.tar.gz git-b85ecea625cb990ce9f02793a69fb339bb467e6c.tar.xz | |
config doc: update dot-repository notes
branch.<name>.remote can be set to '.' (period) as the repository
path (URL) as part of the remote name dwimmery. Tell the reader.
Such relative paths are not 'special'. Correct the branch.<name>.merge
note.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0fa3f89c0..0614f338e 100644 --- a/Documentation/config.txt +++ b/Documentation/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 |