Skip to content

Commit

Permalink
Merge branch 'mg/status-v-v'
Browse files Browse the repository at this point in the history
"git status" now allows the "-v" to be given twice to show the
differences that are left in the working tree not to be committed.

* mg/status-v-v:
  commit/status: show the index-worktree diff with -v -v
  t7508: test git status -v
  t7508: .gitignore 'expect' and 'output' files
  • Loading branch information
Junio C Hamano committed Mar 17, 2015
2 parents 795b014 + 4055500 commit 9bb56e4
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 67 deletions.
4 changes: 4 additions & 0 deletions Documentation/git-commit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,10 @@ configuration variable documented in linkgit:git-config[1].
would be committed at the bottom of the commit message
template. Note that this diff output doesn't have its
lines prefixed with '#'.
+
If specified twice, show in addition the unified diff between
what would be committed and the worktree files, i.e. the unstaged
changes to tracked files.

-q::
--quiet::
Expand Down
Loading

0 comments on commit 9bb56e4

Please sign in to comment.