diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:49 -0800 |
| commit | 986eb34b7165b38cf34229a6f4e43f81b3bd5758 (patch) | |
| tree | a6966b2eea1ea4d406ac500d587ec94009c97e4d /Documentation | |
| parent | f9b889dd67b7a92fd78d9f3385fd2f83e9efdaa8 (diff) | |
| parent | b50252484f7e106e19e4feeb714ae88336295e5e (diff) | |
| download | git-986eb34b7165b38cf34229a6f4e43f81b3bd5758.tar.xz | |
Merge branch 'es/worktree-chatty-to-stderr'
"git worktree add" showed "Preparing worktree" message to the
standard output stream, but when it failed, the message from die()
went to the standard error stream. Depending on the order the
stdio streams are flushed at the program end, this resulted in
confusing output. It has been corrected by sending all the chatty
messages to the standard error stream.
* es/worktree-chatty-to-stderr:
git-worktree.txt: add missing `-v` to synopsis for `worktree list`
worktree: send "chatty" messages to stderr
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-worktree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 8a7cbdd19c..9e862fbcf7 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>] -'git worktree list' [--porcelain] +'git worktree list' [-v | --porcelain] 'git worktree lock' [--reason <string>] <worktree> 'git worktree move' <worktree> <new-path> 'git worktree prune' [-n] [-v] [--expire <expire>] |