Merge branch 'dt/api-doc-setup-gently'

* dt/api-doc-setup-gently: docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
git-mirror · Jun 3, 2014 · 520cd9c · 520cd9c
2 parents 7ea60c1 + 1d39dbe
commit 520cd9c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt
@@ -22,11 +22,14 @@ Git:
 where options is the bitwise-or of:
 
 `RUN_SETUP`::
-
-	Make sure there is a Git directory to work on, and if there is a
-	work tree, chdir to the top of it if the command was invoked
-	in a subdirectory.  If there is no work tree, no chdir() is
-	done.
+	If there is not a Git directory to work on, abort.  If there
+	is a work tree, chdir to the top of it if the command was
+	invoked in a subdirectory.  If there is no work tree, no
+	chdir() is done.
+
+`RUN_SETUP_GENTLY`::
+	If there is a Git directory, chdir as per RUN_SETUP, otherwise,
+	don't chdir anywhere.
 
 `USE_PAGER`::