Skip to content

Commit f92f068

Browse files
committed
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
2 parents 807c895 + 08f8d5d commit f92f068

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Documentation/config.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,8 @@ branch.<name>.remote::
724724
overridden by `branch.<name>.pushremote`. If no remote is
725725
configured, or if you are not on any branch, it defaults to
726726
`origin` for fetching and `remote.pushdefault` for pushing.
727+
Additionally, `.` (a period) is the current local repository
728+
(a dot-repository), see `branch.<name>.merge`'s final note below.
727729

728730
branch.<name>.pushremote::
729731
When on branch <name>, it overrides `branch.<name>.remote` for
@@ -749,8 +751,8 @@ branch.<name>.merge::
749751
Specify multiple values to get an octopus merge.
750752
If you wish to setup 'git pull' so that it merges into <name> from
751753
another branch in the local repository, you can point
752-
branch.<name>.merge to the desired branch, and use the special setting
753-
`.` (a period) for branch.<name>.remote.
754+
branch.<name>.merge to the desired branch, and use the relative path
755+
setting `.` (a period) for branch.<name>.remote.
754756

755757
branch.<name>.mergeoptions::
756758
Sets default options for merging into branch <name>. The syntax and

Documentation/gitcli.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ working tree. After running `git add hello.c; rm hello.c`, you will _not_
5959
see `hello.c` in your working tree with the former, but with the latter
6060
you will.
6161

62+
* Just as the filesystem '.' (period) refers to the current directory,
63+
using a '.' as a repository name in Git (a dot-repository) is a relative
64+
path and means your current repository.
65+
6266
Here are the rules regarding the "flags" that you should follow when you are
6367
scripting Git:
6468

0 commit comments

Comments
 (0)