Revision 57be46fd213b448f66b1470187109e7d6ad6f475 authored by Junio C Hamano on 26 June 2006, 21:05:13 UTC, committed by Junio C Hamano on 26 June 2006, 21:05:13 UTC
* ew/rebase:
  rebase: allow --skip to work with --merge
  rebase: cleanup rebasing with --merge
  rebase: allow --merge option to handle patches merged upstream
2 parent s 07d6893 + d5e673b
History
File Mode Size
xdiff.h -rw-r--r-- 2.2 KB
xdiffi.c -rw-r--r-- 14.4 KB
xdiffi.h -rw-r--r-- 1.7 KB
xemit.c -rw-r--r-- 4.4 KB
xemit.h -rw-r--r-- 1.1 KB
xinclude.h -rw-r--r-- 1.2 KB
xmacros.h -rw-r--r-- 1.9 KB
xprepare.c -rw-r--r-- 10.6 KB
xprepare.h -rw-r--r-- 1.1 KB
xtypes.h -rw-r--r-- 1.6 KB
xutils.c -rw-r--r-- 5.6 KB
xutils.h -rw-r--r-- 1.6 KB

back to top