diff --git a/Documentation/config.txt b/Documentation/config.txt index d4d93c973..ab26963d6 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -724,6 +724,8 @@ branch..remote:: overridden by `branch..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..merge`'s final note below. branch..pushremote:: When on branch , it overrides `branch..remote` for @@ -749,8 +751,8 @@ branch..merge:: Specify multiple values to get an octopus merge. If you wish to setup 'git pull' so that it merges into from another branch in the local repository, you can point - branch..merge to the desired branch, and use the special setting - `.` (a period) for branch..remote. + branch..merge to the desired branch, and use the relative path + setting `.` (a period) for branch..remote. branch..mergeoptions:: Sets default options for merging into branch . The syntax and diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 7d54b77f3..3146413cc 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -59,6 +59,10 @@ working tree. After running `git add hello.c; rm hello.c`, you will _not_ see `hello.c` in your working tree with the former, but with the latter you will. + * Just as the filesystem '.' (period) refers to the current directory, + using a '.' as a repository name in Git (a dot-repository) is a relative + path and means your current repository. + Here are the rules regarding the "flags" that you should follow when you are scripting Git: