git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Jonas Fonseca <fonseca@diku.dk>
Cc: Erik Colson <eco@ecocode.net>, git@vger.kernel.org
Subject: Re: git-gui console app ?
Date: Fri, 10 Aug 2007 10:21:04 -0400	[thread overview]
Message-ID: <20070810142104.GA10997@sigill.intra.peff.net> (raw)
In-Reply-To: <20070810133132.GA3770@diku.dk>

On Fri, Aug 10, 2007 at 03:31:32PM +0200, Jonas Fonseca wrote:

> Not quite a one-liner, but I've implemented something that will show
> diffs of staged/unstaged changes as well as the content of untracked
> files when pressing Enter on a file in the status view. To update the
> status of a file (unstaged->staged, untracked->staged, etc) you now
> have to press 'u'.

Nice. This was exactly what I had envisioned. Minor help text fixup is
below.

-Peff

-- >8 --
status window: mention 'u' instead of Enter

Commits ca1d71ea and 89d917a bound the Enter functionality
to 'u' (and Enter now shows the diff).

Signed-off-by: Jeff King <peff@peff.net>
---
 tig.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tig.c b/tig.c
index d9c9df8..40670e2 100644
--- a/tig.c
+++ b/tig.c
@@ -3156,15 +3156,15 @@ status_select(struct view *view, struct line *line)
 
 	switch (line->type) {
 	case LINE_STAT_STAGED:
-		text = "Press Enter to unstage file for commit";
+		text = "Press 'u' to unstage file for commit";
 		break;
 
 	case LINE_STAT_UNSTAGED:
-		text = "Press Enter to stage file for commit  ";
+		text = "Press 'u' to stage file for commit  ";
 		break;
 
 	case LINE_STAT_UNTRACKED:
-		text = "Press Enter to stage file for addition";
+		text = "Press 'u' to stage file for addition";
 		break;
 
 	case LINE_STAT_NONE:
-- 
1.5.2.4

  reply	other threads:[~2007-08-10 14:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-04 10:10 git-gui console app ? Erik Colson
2007-08-04 11:29 ` Johannes Schindelin
2007-08-04 11:53   ` Erik Colson
2007-08-04 12:03     ` Jeff King
2007-08-04 12:38       ` Erik Colson
2007-08-04 18:38         ` Junio C Hamano
2007-08-05 10:19         ` Jeff King
2007-08-10 13:31           ` Jonas Fonseca
2007-08-10 14:21             ` Jeff King [this message]
2007-08-11 10:11               ` Jonas Fonseca
2007-08-10 14:25             ` Erik Colson
2007-08-11 10:22               ` Jonas Fonseca
2007-08-07 14:21 ` David Kågedal
2007-08-07 15:18   ` Erik Colson

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=20070810142104.GA10997@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=eco@ecocode.net \
    --cc=fonseca@diku.dk \
    --cc=git@vger.kernel.org \
    /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).