[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git: avoiding merges, rebasing
From: |
Eric Blake |
Subject: |
Re: git: avoiding merges, rebasing |
Date: |
Tue, 02 Oct 2007 06:16:25 -0600 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.6) Gecko/20070728 Thunderbird/2.0.0.6 Mnenhy/0.7.5.666 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[adding the git list]
According to Bruno Haible on 10/2/2007 5:50 AM:
> Hello Benoit,
>
>>> $ git stash
>>> $ git pull
>>> $ git stash apply
>>> $ git stash clean ; typo!
>>> $ git stash clear ; fatal correction to typo!
>>>
>>> and lost 20 modified files. Well, not really lost. Just took me a
>>> while to
>> I don't really see how and why you "lost 20 modified files".
>
> I lost modifications to 20 files. "git stash clean" moved these modifications
> into a stash named "clean", and "git stash clear" killed it.
While we're at it, I wish 'git stash clear' would take an optional
argument that says which stash(es) to clear, rather than blindly clearing
the entire stash.
Short of that, there's always manually editing .git/logs/refs/stash, to
delete the lines to the stashes you no longer need, without killing the
ones you want kept.
- --
Don't work too hard, make some time for fun as well!
Eric Blake address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHAjaY84KuGfSFAYARAjqCAJ9qRzVxWpujzTGU9zdDi1UkQiSLggCeMien
LJhXdjlNHQYv0BUMCyZQo20=
=xPKQ
-----END PGP SIGNATURE-----
- Re: git: avoiding merges, rebasing, Bruno Haible, 2007/10/01
- Re: git: avoiding merges, rebasing, Benoit SIGOURE, 2007/10/02
- Re: git: avoiding merges, rebasing, Bruno Haible, 2007/10/02
- Re: git: avoiding merges, rebasing,
Eric Blake <=
- stash clear, was Re: git: avoiding merges, rebasing, Johannes Schindelin, 2007/10/19
- Re: stash clear, was Re: git: avoiding merges, rebasing, Miles Bader, 2007/10/23
- Re: git: avoiding merges, rebasing, Benoit SIGOURE, 2007/10/02
- Re: git: avoiding merges, rebasing, Bruno Haible, 2007/10/03
- Re: git: avoiding merges, rebasing, Bruno Haible, 2007/10/03