From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Matthieu Moy <Matthieu.Moy@imag.fr>,
Ivo Anjo <ivo.anjo@ist.utl.pt>
Subject: [PATCHv2 0/2] More diffs for commit/status
Date: Tue, 3 Mar 2015 15:16:20 +0100 [thread overview]
Message-ID: <cover.1425390756.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <54B8C82E.8000707@drmicha.warpmail.net>
Trying to clean up my old RFCs, so here's a mini-series that
1) adds a test for "status -v" (the diff between HEAD and index) and
2) implements "status -v -v" (additional diff between index and worktree).
The idea is that in a case where "commit -v" would list fils with unstaged
changes one would get the diff for these changes with '-v -v' easily.
2/2 also sets the diff prefixes (a/,b/ etc.) for both diffs in the '-v -v'
case to a really verbose version to avoid any confusion between the two
types of diffs. We may want to do that for '-v' already, although that
would be a change in behavior.
The wording for the new prefixes is chosen after the status hints, although
they are not localised.
Michael J Gruber (2):
t7508: test git status -v
commit/status: show the index-worktree diff with -v -v
Documentation/git-commit.txt | 4 ++++
t/t7508-status.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++
wt-status.c | 10 +++++++++
3 files changed, 63 insertions(+)
--
2.3.1.303.g5174db1
next prev parent reply other threads:[~2015-03-03 14:16 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 8:56 How to prevent empty git commit --amend Ivo Anjo
2015-01-13 8:59 ` Daniel Knittl-Frank
2015-01-13 10:22 ` Ivo Anjo
2015-01-13 11:20 ` Michael J Gruber
2015-01-14 10:00 ` Matthieu Moy
2015-01-14 12:15 ` Ivo Anjo
2015-01-14 12:45 ` Matthieu Moy
2015-01-14 17:27 ` Junio C Hamano
2015-01-14 17:36 ` Junio C Hamano
2015-01-15 16:08 ` [RFC/PATCH] commit/status: show the index-worktree with -v -v Michael J Gruber
2015-01-15 20:11 ` Junio C Hamano
2015-01-15 20:38 ` Junio C Hamano
2015-01-16 8:13 ` Michael J Gruber
2015-03-03 14:16 ` Michael J Gruber [this message]
2015-03-03 14:16 ` [PATCHv2 1/2] t7508: test git status -v Michael J Gruber
2015-03-03 21:20 ` Junio C Hamano
2015-03-03 22:26 ` Junio C Hamano
2015-03-04 11:05 ` Michael J Gruber
2015-03-04 21:27 ` Junio C Hamano
2015-03-03 14:16 ` [PATCHv2 2/2] commit/status: show the index-worktree diff with -v -v Michael J Gruber
2015-03-03 21:26 ` Junio C Hamano
2015-03-04 11:11 ` Michael J Gruber
2015-03-04 21:13 ` Junio C Hamano
2015-03-05 14:13 ` [PATCHv3 0/3]More diffs for commit/status Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 1/3] t7508: .gitignore 'expect' and 'output' files Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 2/3] t7508: test git status -v Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 3/3] commit/status: show the index-worktree diff with -v -v Michael J Gruber
2015-03-05 19:25 ` [PATCHv3 0/3]More diffs for commit/status Junio C Hamano
2015-03-05 20:15 ` Junio C Hamano
2015-03-05 20:27 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1425390756.git.git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ivo.anjo@ist.utl.pt \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).