git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Vincent Legoll" <vincent.legoll@gmail.com>
To: "Martin Langhoff" <martin.langhoff@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git-diff & cg-diff behavior difference
Date: Tue, 19 Dec 2006 11:33:21 +0100	[thread overview]
Message-ID: <4727185d0612190233w26188a56t50ad49d2de58b88b@mail.gmail.com> (raw)
In-Reply-To: <46a038f90612181249y5ee69a8al28e97a22dca80c81@mail.gmail.com>

On 12/18/06, Martin Langhoff <martin.langhoff@gmail.com> wrote:
> I'd say that it's a bug that cg-diff doesn't work in a subdir.
> However, there is a much more important difference between cg-diff and
> git-diff: cg-diff is equivalent to git-diff HEAD because cogito hides
> the index from you.

That's what I wanted to know: if it was a deliberate behavior, a bug on
my side, or on git's...

> If you are developing in a (mostly) straight line, and not dealing
> much with merges and rebases, that's a great simplification. If you
> are coming from a different SCM it's probably a good thing too.

That's me and me !

> If/when you want to use git's smarts for merging and rebasing, you'll
> definitely want to know a lot more about the index, and you'll
> probably stop using cogito.

That will be me some times...

> (Actually, even though I know and love the index I use cogito all the
> time, and switch to git commands for merging and rebasing. Works
> great... and yet Linus is in a merge-centric role, so changing the
> defaults to ignore the index most of the time is a bit of a hot issue

That's no problem with me, if behavior is properly documented...

-- 

  parent reply	other threads:[~2006-12-19 10:33 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-17 17:11 git-diff & cg-diff behavior difference Vincent Legoll
     [not found] ` <46a038f90612181249y5ee69a8al28e97a22dca80c81@mail.gmail.com>
2006-12-19 10:33   ` Vincent Legoll [this message]
2006-12-19 10:43     ` Vincent Legoll

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=4727185d0612190233w26188a56t50ad49d2de58b88b@mail.gmail.com \
    --to=vincent.legoll@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=martin.langhoff@gmail.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 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).