git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bruce Korb <bruce.korb@gmail.com>
To: GIT Development <git@vger.kernel.org>
Subject: How do I get a readable diff?
Date: Fri, 26 Aug 2011 15:42:50 -0700	[thread overview]
Message-ID: <4E58216A.8060508@gmail.com> (raw)

I know I can pipe it through "cat", but I'd rather the clutter be gone.
There has to be a way.

ESC[1mdiff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.hESC[m
ESC[1mindex 10f6328..564fc08 100644ESC[m
ESC[1m--- a/lustre/include/lustre_disk.hESC[m
ESC[1m+++ b/lustre/include/lustre_disk.hESC[m
ESC[36m@@ -185,6 +185,7 @@ESC[m ESC[mstruct lustre_mount_data {ESC[m
          int        lmd_exclude_count;ESC[m
          int        lmd_recovery_time_soft;ESC[m
          int        lmd_recovery_time_hard;ESC[m
ESC[32m+ESC[mESC[32m        int        lmd_reserved_inodes; /* preferred value */ESC[m
          char      *lmd_dev;           /* device name */ESC[m
          char      *lmd_profile;       /* client only */ESC[m
          char      *lmd_mgssec;        /* sptlrpc flavor to mgs */ESC[m
ESC[36m@@ -202,6 +203,8 @@ESC[m ESC[mstruct lustre_mount_data {ESC[m
                                          existing MGS services */ESC[m
  #define LMD_FLG_WRITECONF    0x0040  /* Rewrite config log */ESC[m
  ESC[m
ESC[32m+ESC[mESC[32m#define LMD_RESERVED_INODES_DEFAULT 100ESC[m
ESC[32m+ESC[m
  #define lmd_is_client(x) ((x)->lmd_flags & LMD_FLG_CLIENT)ESC[m
  ESC[m
  ESC[m

             reply	other threads:[~2011-08-26 22:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-26 22:42 Bruce Korb [this message]
2011-08-26 22:58 ` How do I get a readable diff? Brandon Casey
2011-08-26 23:17   ` 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=4E58216A.8060508@gmail.com \
    --to=bruce.korb@gmail.com \
    --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).