git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
	Sverre Rabbelier <srabbelier@gmail.com>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Git List <git@vger.kernel.org>
Subject: Re: non-empty index with git commit -a
Date: Wed, 16 Feb 2011 13:46:01 -0800	[thread overview]
Message-ID: <7v39nnirfq.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <201102162203.40480.jnareb@gmail.com> (Jakub Narebski's message of "Wed\, 16 Feb 2011 22\:03\:31 +0100")

Jakub Narebski <jnareb@gmail.com> writes:

>> So I think we are really on the same page. :)
>
> Also it would be not as easy as reflogs - you would have either to save
> copy of index, or create a tree out of it and save reference in reflog.

Also note that "Create a tree out of it" is not always a useful way to
save the state of the index.  The "stash" shares the same issue, but you
would need an equivalent of a tarball that consists of the index file
(with conflicted state) and the files in the working tree that corresponds
to index entries with conflicted states if you want to be useful for
storing a state away in case you botch the conflict resolution you are
attempting.

  reply	other threads:[~2011-02-16 21:46 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-15 22:43 non-empty index with git commit -a Sverre Rabbelier
2011-02-16  2:36 ` Jeff King
2011-02-16  3:20   ` Jonathan Nieder
2011-02-16  3:27     ` Jeff King
2011-02-16  8:18     ` Sverre Rabbelier
2011-02-16  8:29       ` Nguyen Thai Ngoc Duy
2011-02-16  8:44         ` Jonathan Nieder
2011-02-16  8:51       ` Jeff King
2011-02-16  9:52         ` Sverre Rabbelier
2011-02-16  9:54           ` Jeff King
2011-02-16  9:58             ` Sverre Rabbelier
2011-02-16 10:06               ` Jeff King
2011-02-16 14:41                 ` Michael J Gruber
2011-02-16 19:29                   ` Jeff King
2011-02-16 18:51                 ` Junio C Hamano
2011-02-16 19:36                   ` Jeff King
2011-02-16 19:55                     ` Junio C Hamano
2011-02-16 19:59                       ` Jeff King
2011-02-16 21:03                         ` Jakub Narebski
2011-02-16 21:46                           ` Junio C Hamano [this message]
2011-02-16 22:34                             ` Jeff King
2011-02-16 10:28             ` Matthieu Moy
2011-02-16 19:48               ` Jeff King
2011-02-16 18:47           ` Junio C Hamano
2011-02-16  9:05     ` Matthieu Moy

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v39nnirfq.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=srabbelier@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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).