summaryrefslogtreecommitdiff
path: root/Documentation/git-rev-parse.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-10 15:56:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-10 15:56:17 -0700
commitefc5fb6a77780c53c6636326ca82ff87b17e4c5f (patch)
treedf55c7da6100b8b102b183dee72c9137b0d68075 /Documentation/git-rev-parse.txt
parentFix some "variable might be used uninitialized" warnings (diff)
parentMove git-dir for submodules (diff)
downloadtgif-efc5fb6a77780c53c6636326ca82ff87b17e4c5f.tar.xz
Merge branch 'fg/submodule-git-file-git-dir'
* fg/submodule-git-file-git-dir: Move git-dir for submodules rev-parse: add option --resolve-git-dir <path> Conflicts: cache.h git-submodule.sh
Diffstat (limited to 'Documentation/git-rev-parse.txt')
-rw-r--r--Documentation/git-rev-parse.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 42c9676eaa..8023dc086d 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -180,6 +180,10 @@ print a message to stderr and exit with nonzero status.
<args>...::
Flags and parameters to be parsed.
+--resolve-git-dir <path>::
+ Check if <path> is a valid git-dir or a git-file pointing to a valid
+ git-dir. If <path> is a valid git-dir the resolved path to git-dir will
+ be printed.
include::revisions.txt[]