All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: David <wizzardx@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: User's mailing list? And multiple cherry pick
Date: Wed, 4 Jun 2008 11:47:52 +0200	[thread overview]
Message-ID: <200806041147.53523.jnareb@gmail.com> (raw)
In-Reply-To: <18c1e6480806040237m1f85c3f2s98ddb35ee1598ab2@mail.gmail.com>

David wrote:

[...]
> In your example, you still have a TMP "rollback" point if you need to
> rewind master in the event that the merge into master goes badly.

And you have ORIG_HEAD and reflog (master@{1}, master@{2} etc.) as 
safety net.  Reflog is now enabled by default.

Besides unless you run prune in the meantime, even without reflogs you 
would be able to recover using lost-found / git-fsck output.
-- 
Jakub Narebski
Poland

  reply	other threads:[~2008-06-04  9:49 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-04  6:55 User's mailing list? And multiple cherry pick David
2008-06-04  6:58 ` Junio C Hamano
2008-06-04  7:13   ` David
2008-06-04  8:05     ` Jakub Narebski
2008-06-04  8:23       ` Johan Herland
2008-06-04  8:30       ` David
2008-06-04  9:39         ` Wincent Colaiuta
2008-06-04 10:02           ` David
2008-06-04 11:02             ` Wincent Colaiuta
2008-06-04 11:09             ` Jakub Narebski
2008-06-04 18:09             ` Björn Steinbrink
2008-06-04  8:16     ` Johan Herland
2008-06-04  7:39 ` Jakub Narebski
2008-06-04  8:11   ` David
2008-06-04  8:50     ` Jakub Narebski
2008-06-04  9:37       ` David
2008-06-04  9:47         ` Jakub Narebski [this message]
2008-06-04 11:36     ` Theodore Tso
2008-06-04 10:38   ` Karl Hasselström
2008-06-04 11:10     ` Miklos Vajna
2008-06-04  8:00 ` Stephan Beyer
2008-06-04  8:20   ` David

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=200806041147.53523.jnareb@gmail.com \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=wizzardx@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 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.