diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-26 14:05:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-26 14:05:13 -0700 |
| commit | 57be46fd213b448f66b1470187109e7d6ad6f475 (patch) | |
| tree | 7b597a96f96d9ec65d4af995c0bfbc530be58e55 /xdiff/xdiffi.c | |
| parent | 07d68930c247325116ad4a63422eb1520aaf6ef8 (diff) | |
| parent | d5e673b60be2eb99153276366b6b5ff3277805df (diff) | |
| download | git-57be46fd213b448f66b1470187109e7d6ad6f475.tar.gz git-57be46fd213b448f66b1470187109e7d6ad6f475.tar.xz | |
Merge branch 'ew/rebase'
* ew/rebase:
rebase: allow --skip to work with --merge
rebase: cleanup rebasing with --merge
rebase: allow --merge option to handle patches merged upstream
Diffstat (limited to 'xdiff/xdiffi.c')
0 files changed, 0 insertions, 0 deletions