All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jun 2010, #04; Wed, 23)
Date: Thu, 24 Jun 2010 16:48:15 +0200	[thread overview]
Message-ID: <4C23702F.8030707@viscovery.net> (raw)
In-Reply-To: <7viq59e6zn.fsf@alter.siamese.dyndns.org>

Am 6/24/2010 0:09, schrieb Junio C Hamano:
> * cp/textconv-cat-file (2010-06-09) 4 commits
>  - [DONTMERGE] git gui: use textconv filter for diff and blame

This git-gui patch needs a fixup.

-- Hannes

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index b02d2e5..c628750 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -280,7 +280,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
 			lappend cmd diff-files
 		}
 	}
-	if {![is_config_false gui.textconv] && [git-version >ñ.6.1]} {
+	if {![is_config_false gui.textconv] && [git-version >= 1.6.1]} {
 		lappend cmd --textconv
 	}

  parent reply	other threads:[~2010-06-24 14:48 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-23 22:09 What's cooking in git.git (Jun 2010, #04; Wed, 23) Junio C Hamano
     [not found] ` <7veifxe63j.fsf@alter.siamese.dyndns.org>
2010-06-23 22:54   ` [PATCH] bash completion: Support "divergence from upstream" messages in __git_ps1 Shawn O. Pearce
2010-06-23 23:21 ` What's cooking in git.git (Jun 2010, #04; Wed, 23) Ævar Arnfjörð Bjarmason
2010-06-24  0:44 ` Nazri Ramliy
2010-06-24  3:46 ` Tay Ray Chuan
2010-06-24 11:17 ` Finn Arne Gangstad
2010-06-24 11:42   ` Johannes Sixt
2010-06-24 11:58     ` Finn Arne Gangstad
2010-06-24 12:23     ` Eyvind Bernhardsen
2010-06-24 20:21   ` Junio C Hamano
2010-06-24 20:51     ` Eyvind Bernhardsen
2010-06-24 22:48       ` Junio C Hamano
2010-06-25  8:43         ` Finn Arne Gangstad
2010-06-25 19:43         ` Eyvind Bernhardsen
2010-06-25 21:17           ` Junio C Hamano
2010-06-25  6:02     ` Johannes Sixt
2010-06-25  7:46     ` Finn Arne Gangstad
2010-06-24 14:48 ` Johannes Sixt [this message]
2010-06-24 15:33   ` git log --objects Holger Hellmuth
2010-06-25 10:06     ` Santi Béjar
2010-06-24 15:41   ` What's cooking in git.git (Jun 2010, #04; Wed, 23) Clément Poulain
2010-06-25  2:27 ` Christian Couder
2010-06-25 10:30 ` Ævar Arnfjörð Bjarmason
2010-06-25 13:43 ` Michael J Gruber

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=4C23702F.8030707@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.