Skip to content

Commit

Permalink
config doc: update dot-repository notes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Philip Oakley authored and Junio C Hamano committed Sep 13, 2013
1 parent 431260c commit b85ecea
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit b85ecea

Please sign in to comment.