diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-24 00:21:48 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-24 00:21:48 +0400 |
| commit | f92f068e76a272ac074ff9f693a3aaa84bb9e636 (patch) | |
| tree | 9729855621995424a1092ff71d76db5ab69e2ff9 /Documentation/config.txt | |
| parent | 807c895fcbf004d7a8f2bfd9aae5ea3b4f0c760b (diff) | |
| parent | 08f8d5d0c062e425d5ba08c57b94e47cc7543112 (diff) | |
Merge branch 'po/dot-url'
Explain how '.' can be used to refer to the "current repository"
in the documentation.
* po/dot-url:
doc/cli: make "dot repository" an independent bullet point
config doc: update dot-repository notes
doc: command line interface (cli) dot-repository dwimmery
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 d4d93c9732..ab26963d61 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 |