* mini-wierdness with "git am"
@ 2011-11-30 23:12 Aghiles
2011-12-01 15:38 ` Andrew Wong
0 siblings, 1 reply; 2+ messages in thread
From: Aghiles @ 2011-11-30 23:12 UTC (permalink / raw)
To: git list
Hello,
I am using : git version 1.7.0.3, in Mac OS X.
A slightly strange behavior occurs with "git am --abort". Here
is the sequence:
> git am 000*
error: ... : patch doesn not apply
(oops, forgot to reset)
> git reset --hard HEAD~1
> git am 000*
previous rebase directory ... still exists but mbox given.
(oops, forgot to abort)
> git am --abort
At this point, my repository is back to ORIG_HEAD!
Meaning that it reverted my preivous "git reset --hard HEAD~1".
Hope this is clear.
As usual, thanks for the great product.
-- aghiles
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: mini-wierdness with "git am"
2011-11-30 23:12 mini-wierdness with "git am" Aghiles
@ 2011-12-01 15:38 ` Andrew Wong
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Wong @ 2011-12-01 15:38 UTC (permalink / raw)
To: Aghiles; +Cc: git list
On 11/30/2011 06:12 PM, Aghiles wrote:
> At this point, my repository is back to ORIG_HEAD!
> Meaning that it reverted my preivous "git reset --hard HEAD~1".
>
This behavior seems to have been fixed in v1.7.3.5 and later. The new
behavior will skip the reverting, and only perform the clean up.
http://article.gmane.org/gmane.comp.version-control.git/164045
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-01 15:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-30 23:12 mini-wierdness with "git am" Aghiles
2011-12-01 15:38 ` Andrew Wong
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).