From: Petr Baudis <pasky@suse.cz>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Langhoff <martin.langhoff@gmail.com>, git@vger.kernel.org
Subject: Re: [FAQ?] Rationale for git's way to manage the index
Date: Wed, 9 May 2007 15:41:51 +0200 [thread overview]
Message-ID: <20070509134151.GT4489@pasky.or.cz> (raw)
In-Reply-To: <alpine.LFD.0.98.0705072137450.3974@woody.linux-foundation.org>
On Tue, May 08, 2007 at 06:45:32AM CEST, Linus Torvalds wrote:
> Git used explicit index updates from day 1, even before it did the first
> merge. It's simply how I've always worked. I tend to have dirty trees,
> with some random patch in my tree that I do *not* want to commit, because
> it's just a Makefile update for the next version (to remind me - I've
> released kernel versions too many times with an old version number, just
> because I forgot to update the Makefile).
>
> Or other things like that - I have small test-patches in my tree that I
> want to build, but that I don't want to commit, and I end up doing big
> merges and whole patch-application sequences with such a dirty tree
> (obviously if the patch or merge wants to change that file, I then need to
> do something about that dirty state, but it happens surprisingly seldom).
Hmm, does this really work so well for you guys? Because thanks to Mr.
Murphy, in my case, when I have some custom Makefile tweak, I always
need to commit some unrelated changes involving Makefile more often than
usual, and so on; so in general case, file-level changes exclusion
doesn't really work so well for me.
So this use of index seems to me really as a workaround for more
fine-grained change control (in a similar way that rename following
would be a workaround for lack of more fine-grained content moves
tracking). I will have to look into git-gui's hunk-level control and
maybe reimplement it in tig.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Ever try. Ever fail. No matter. // Try again. Fail again. Fail better.
-- Samuel Beckett
next prev parent reply other threads:[~2007-05-09 13:42 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-06 16:10 [FAQ?] Rationale for git's way to manage the index Matthieu Moy
2007-05-06 16:51 ` Johannes Schindelin
2007-05-06 17:34 ` Matthieu Moy
2007-05-06 17:43 ` Junio C Hamano
2007-05-09 12:52 ` Petr Baudis
2007-05-09 13:57 ` Johannes Schindelin
2007-05-09 14:24 ` [PATCH] git-commit: Reformat log messages provided on commandline Petr Baudis
2007-05-09 14:59 ` Matthieu Moy
2007-05-09 15:11 ` Petr Baudis
2007-05-09 15:32 ` Matthieu Moy
2007-05-09 15:01 ` Johannes Schindelin
2007-05-10 0:45 ` Junio C Hamano
2007-05-12 0:25 ` Jakub Narebski
2007-05-06 18:22 ` [FAQ?] Rationale for git's way to manage the index Dana How
2007-05-06 23:42 ` Johannes Schindelin
2007-05-06 17:25 ` Linus Torvalds
2007-05-06 18:23 ` Matthieu Moy
2007-05-06 19:54 ` Linus Torvalds
2007-05-06 22:53 ` Julian Phillips
2007-05-07 6:35 ` Karl Hasselström
2007-05-08 1:41 ` Shawn O. Pearce
2007-05-08 7:15 ` Johannes Sixt
2007-05-08 10:28 ` Karl Hasselström
2007-05-08 12:40 ` J. Bruce Fields
2007-05-08 14:53 ` Karl Hasselström
2007-05-09 3:45 ` J. Bruce Fields
2007-05-09 9:40 ` Johannes Schindelin
2007-05-08 7:37 ` Karl Hasselström
2007-05-08 14:52 ` Shawn O. Pearce
2007-05-06 23:51 ` Johannes Schindelin
2007-05-07 8:02 ` Matthieu Moy
2007-05-07 11:05 ` Johannes Schindelin
2007-05-09 13:07 ` Petr Baudis
2007-05-08 3:16 ` Martin Langhoff
2007-05-08 4:45 ` Linus Torvalds
2007-05-08 5:35 ` Martin Langhoff
2007-05-09 13:41 ` Petr Baudis [this message]
2007-05-09 15:52 ` Linus Torvalds
2007-05-09 16:29 ` Carl Worth
2007-05-11 1:28 ` Jakub Narebski
[not found] ` <7vd518gkyo.fsf@assigned-by-dhcp.cox.net>
2007-05-11 11:26 ` Jakub Narebski
2007-05-11 16:45 ` Junio C Hamano
2007-05-11 23:06 ` Jakub Narebski
2007-05-12 0:40 ` Junio C Hamano
2007-05-12 1:06 ` Jakub Narebski
2007-05-12 9:35 ` Jakub Narebski
2007-05-09 16:33 ` Dana How
2007-05-09 17:18 ` J. Bruce Fields
2007-05-09 17:26 ` Petr Baudis
2007-05-09 17:29 ` J. Bruce Fields
2007-05-09 17:39 ` Daniel Barkalow
2007-05-09 18:16 ` Linus Torvalds
2007-05-10 0:31 ` Junio C Hamano
2007-05-10 2:27 ` Steven Grimm
2007-05-10 2:39 ` Linus Torvalds
2007-05-10 8:00 ` Matthieu Moy
2007-05-10 22:06 ` Shawn O. Pearce
2007-05-10 22:51 ` Petr Baudis
2007-05-08 11:07 ` Johannes Schindelin
2007-05-15 1:00 ` David Kågedal
2007-05-15 23:27 ` Johannes Schindelin
2007-05-09 17:18 ` Matthieu Moy
2007-05-07 11:40 ` Guilhem Bonnefille
2007-05-07 12:16 ` Karl Hasselström
2007-05-07 12:36 ` David Kastrup
2007-05-07 12:55 ` Johannes Schindelin
2007-05-07 19:31 ` Junio C Hamano
2007-05-09 13:14 ` Petr Baudis
2007-05-07 22:23 ` Daniel Barkalow
2007-05-15 0:57 ` David Kågedal
2007-05-15 8:29 ` Karl Hasselström
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=20070509134151.GT4489@pasky.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
--cc=torvalds@linux-foundation.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).