Revision 677fa8d1157c869974355e316d0e2349759d0325 authored by Luke Diamand on 19 September 2020, 08:54:40 UTC, committed by Junio C Hamano on 19 September 2020, 20:44:54 UTC
git-p4 unshelve uses HEAD^$n to find the parent commit, which fails if there is an additional commit. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 47ae905
File | Mode | Size |
---|---|---|
xdiff.h | -rw-r--r-- | 3.7 KB |
xdiffi.c | -rw-r--r-- | 27.1 KB |
xdiffi.h | -rw-r--r-- | 1.9 KB |
xemit.c | -rw-r--r-- | 7.9 KB |
xemit.h | -rw-r--r-- | 1.2 KB |
xhistogram.c | -rw-r--r-- | 9.4 KB |
xinclude.h | -rw-r--r-- | 1.1 KB |
xmacros.h | -rw-r--r-- | 1.9 KB |
xmerge.c | -rw-r--r-- | 17.0 KB |
xpatience.c | -rw-r--r-- | 10.5 KB |
xprepare.c | -rw-r--r-- | 12.0 KB |
xprepare.h | -rw-r--r-- | 1.0 KB |
xtypes.h | -rw-r--r-- | 1.5 KB |
xutils.c | -rw-r--r-- | 9.6 KB |
xutils.h | -rw-r--r-- | 1.7 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...