From: Bruno Haible <bruno@clisp.org>
To: Benoit SIGOURE <tsuna@lrde.epita.fr>
Cc: bug-gnulib@gnu.org, git@vger.kernel.org
Subject: Re: git: avoiding merges, rebasing
Date: Thu, 4 Oct 2007 01:01:52 +0200 [thread overview]
Message-ID: <200710040101.52137.bruno@clisp.org> (raw)
In-Reply-To: <6C9F1445-8826-4E6F-A10C-290A57A4C826@lrde.epita.fr>
Benoit SIGOURE wrote:
> >>> Is there some shorthand for this process, such as a "git-recover"
> >>> command?
> >>
> >> you can run git fsck and look for
> >> a dangling commit (which can be inspected with git show <sha1>) where
> >> you are most likely to find your stash (unless you run git-gc or this
> >> sort of thing).
> >
> > Cool! This information would be worth mentioning in the git-stash
> > manual page or in an FAQ. It can be a real life-saver.
>
> True. Propose a patch :-)
Here's a proposed patch.
--- git-1.5.3.4/Documentation/git-stash.txt.bak 2007-10-03 21:44:53.000000000 +0200
+++ git-1.5.3.4/Documentation/git-stash.txt 2007-10-04 01:00:48.000000000 +0200
@@ -154,6 +154,28 @@
... continue hacking ...
----------------------------------------------------------------
+Recovering a lost stash::
+
+`git stash clear` clears all stashes without asking for confirmation.
+If you did not intend this, you can recover the lost changes by running
+`git fsck`, looking for dangling commits, and using `git show <commit>`.
++
+----------------------------------------------------------------
+... hack hack hack ...
+$ git stash
+... hack no coffee hack ...
+$ git stash clear
+... panic panic ...
+$ git fsck
+dangling commit f62c4fa05422fd4fb8610bdb02a7160121657893
+dangling commit 773024d2ffc33ac80baddcf2b673535b627af0da
+dangling commit 9e509390a2b26b562f3b008eacc65b6765d48339
+$ git show 773024d2ffc33ac80baddcf2b673535b627af0da
+$ git diff 773024d2ffc33ac80baddcf2b673535b627af0da > recovered.diff
+$ patch -p0 -R < recovered.diff
+... continue hacking ...
+----------------------------------------------------------------
+
SEE ALSO
--------
gitlink:git-checkout[1],
next prev parent reply other threads:[~2007-10-03 23:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200709301421.52192.bruno@clisp.org>
[not found] ` <200710020347.43733.bruno@clisp.org>
[not found] ` <4AD64749-F4A3-4A61-B1EE-D12523293661@lrde.epita.fr>
[not found] ` <200710021350.54625.bruno@clisp.org>
2007-10-02 12:16 ` git: avoiding merges, rebasing Eric Blake
2007-10-03 21:31 ` making "git stash" safer to use Bruno Haible
2007-10-03 21:36 ` Junio C Hamano
2007-10-04 8:40 ` Joachim B Haga
2007-10-04 20:59 ` David Kastrup
2007-10-19 13:37 ` stash clear, was Re: git: avoiding merges, rebasing Johannes Schindelin
2007-10-23 8:55 ` Miles Bader
[not found] ` <6C9F1445-8826-4E6F-A10C-290A57A4C826@lrde.epita.fr>
2007-10-03 23:01 ` Bruno Haible [this message]
[not found] ` <46FF99E2.8050605@byu.net>
[not found] ` <200709302141.25597.bruno@clisp.org>
[not found] ` <C64152A3-A5A6-4320-864C-E78E3A60C8E6@lrde.epita.fr>
2007-10-08 13:16 ` Benoit SIGOURE
2007-10-08 13:17 ` Benoit SIGOURE
2007-10-09 10:43 ` Johannes Schindelin
2007-10-09 18:06 ` Benoit SIGOURE
2007-10-09 12:03 ` Bruno Haible
2007-10-09 18:19 ` GNU-style ChangeLog merge driver for Git (was: Re: git: avoiding merges, rebasing) Benoit SIGOURE
2007-10-09 19:38 ` GNU-style ChangeLog merge driver for Git Bruno Haible
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=200710040101.52137.bruno@clisp.org \
--to=bruno@clisp.org \
--cc=bug-gnulib@gnu.org \
--cc=git@vger.kernel.org \
--cc=tsuna@lrde.epita.fr \
/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).