From 431260cc8dda69336ced159c39d10007c9584e58 Mon Sep 17 00:00:00 2001 From: Philip Oakley <philipoakley@iee.org> Date: Fri, 13 Sep 2013 22:23:17 +0100 Subject: [PATCH 1/3] doc: command line interface (cli) dot-repository dwimmery The Git cli will accept dot '.' (period) as the relative path to the current repository. Explain this action. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/gitcli.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 9ac5088acd3..16728423184 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -58,6 +58,10 @@ the paths in the index that match the pattern to be checked out to your 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 for your current repository. Here are the rules regarding the "flags" that you should follow when you are scripting Git: From b85ecea625cb990ce9f02793a69fb339bb467e6c Mon Sep 17 00:00:00 2001 From: Philip Oakley <philipoakley@iee.org> Date: Fri, 13 Sep 2013 22:23:16 +0100 Subject: [PATCH 2/3] config doc: update dot-repository notes 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> --- Documentation/config.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 0fa3f89c012..0614f338e7d 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 From 08f8d5d0c062e425d5ba08c57b94e47cc7543112 Mon Sep 17 00:00:00 2001 From: Philip Oakley <philipoakley@iee.org> Date: Tue, 15 Oct 2013 14:57:42 -0700 Subject: [PATCH 3/3] doc/cli: make "dot repository" an independent bullet point The way to spell the current repository with a '.' dot is independent from how the pathspec allows globs expanded by Git. Make them two separate bullet items in the enumeration. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/gitcli.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 16728423184..24e17840239 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -58,10 +58,10 @@ the paths in the index that match the pattern to be checked out to your 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 for your current repository. + + * 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: