summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-10-29 08:14:57 (GMT)
committerJeff King <peff@peff.net>2012-10-29 08:14:58 (GMT)
commiteeb2535f5a517fc0b5e302cab0a70cc82375b836 (patch)
tree360c430d64dea4f58612b65a15575a535d510861 /Documentation
parentdeb2458132a5886c8f7b12870451a1bc3c311e9f (diff)
parentf3f47a1e8ddbecb0865be3d4c5dfef609cb58867 (diff)
downloadgit-eeb2535f5a517fc0b5e302cab0a70cc82375b836.zip
git-eeb2535f5a517fc0b5e302cab0a70cc82375b836.tar.gz
git-eeb2535f5a517fc0b5e302cab0a70cc82375b836.tar.bz2
Merge branch 'nd/status-long'
Allow an earlier "--short" option on the command line to be countermanded with the "--long" option for "git status" and "git commit". * nd/status-long: status: add --long output format option
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-commit.txt4
-rw-r--r--Documentation/git-status.txt3
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 9594ac8..3acf2e7 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -109,6 +109,10 @@ OPTIONS
format. See linkgit:git-status[1] for details. Implies
`--dry-run`.
+--long::
+ When doing a dry-run, give the output in a the long-format.
+ Implies `--dry-run`.
+
-z::
--null::
When showing `short` or `porcelain` status output, terminate
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 67e5f53..9f1ef9a 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -38,6 +38,9 @@ OPTIONS
across git versions and regardless of user configuration. See
below for details.
+--long::
+ Give the output in the long-format. This is the default.
+
-u[<mode>]::
--untracked-files[=<mode>]::
Show untracked files.