Revision 38e7167e9bdc57262c7298912c4bf9df4d68f6fe authored by Felipe Contreras on 01 May 2013, 01:09:58 UTC, committed by Junio C Hamano on 01 May 2013, 05:06:47 UTC
If the branches diverge we want to reset the pointer to where the remote actually is. Since we can access remote branches just as easily as local ones, let's do so. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f38dfc4
File | Mode | Size |
---|---|---|
xdiff.h | -rw-r--r-- | 3.6 KB |
xdiffi.c | -rw-r--r-- | 15.1 KB |
xdiffi.h | -rw-r--r-- | 1.9 KB |
xemit.c | -rw-r--r-- | 6.0 KB |
xemit.h | -rw-r--r-- | 1.2 KB |
xhistogram.c | -rw-r--r-- | 9.0 KB |
xinclude.h | -rw-r--r-- | 1.2 KB |
xmacros.h | -rw-r--r-- | 1.9 KB |
xmerge.c | -rw-r--r-- | 15.1 KB |
xpatience.c | -rw-r--r-- | 9.9 KB |
xprepare.c | -rw-r--r-- | 12.0 KB |
xprepare.h | -rw-r--r-- | 1.1 KB |
xtypes.h | -rw-r--r-- | 1.6 KB |
xutils.c | -rw-r--r-- | 10.8 KB |
xutils.h | -rw-r--r-- | 1.7 KB |
Computing file changes ...