kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2013-10-23 13:21:48 -07:00
parent 807c895fcb 08f8d5d0c0
commit f92f068e76
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config.txt
View File

@ -724,6 +724,8 @@ branch.<name>.remote::
overridden by `branch.<name>.pushremote`. If no remote is overridden by `branch.<name>.pushremote`. If no remote is
configured, or if you are not on any branch, it defaults to configured, or if you are not on any branch, it defaults to
`origin` for fetching and `remote.pushdefault` for pushing. `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:: branch.<name>.pushremote::
When on branch <name>, it overrides `branch.<name>.remote` for 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. Specify multiple values to get an octopus merge.
If you wish to setup 'git pull' so that it merges into <name> from If you wish to setup 'git pull' so that it merges into <name> from
another branch in the local repository, you can point another branch in the local repository, you can point
branch.<name>.merge to the desired branch, and use the special setting branch.<name>.merge to the desired branch, and use the relative path
`.` (a period) for branch.<name>.remote. setting `.` (a period) for branch.<name>.remote.


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

4
Documentation/gitcli.txt
View File

@ -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 see `hello.c` in your working tree with the former, but with the latter
you will. 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 Here are the rules regarding the "flags" that you should follow when you are
scripting Git: scripting Git: