diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-08 12:36:24 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-08 12:36:24 -0800 |
commit | 4094e47fd2c49fcdbd0152d20ed4d610d72680d7 (patch) | |
tree | 6f444715c2f37cf75953f4df436b6adda1483357 /Documentation | |
parent | Merge branch 'sg/travis-build-during-script-phase' (diff) | |
parent | status: support --no-ahead-behind in long format (diff) | |
download | tgif-4094e47fd2c49fcdbd0152d20ed4d610d72680d7.tar.xz |
Merge branch 'jh/status-no-ahead-behind'
"git status" can spend a lot of cycles to compute the relation
between the current branch and its upstream, which can now be
disabled with "--no-ahead-behind" option.
* jh/status-no-ahead-behind:
status: support --no-ahead-behind in long format
status: update short status to respect --no-ahead-behind
status: add --[no-]ahead-behind to status and commit for V2 format.
stat_tracking_info: return +1 when branches not equal
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-status.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index f9c91c721e..6c230c0c72 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -130,6 +130,11 @@ ignored, then the directory is not shown, but all contents are shown. without options are equivalent to 'always' and 'never' respectively. +--ahead-behind:: +--no-ahead-behind:: + Display or do not display detailed ahead/behind counts for the + branch relative to its upstream branch. Defaults to true. + <pathspec>...:: See the 'pathspec' entry in linkgit:gitglossary[7]. |