diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-24 18:29:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-25 00:38:34 -0700 |
| commit | 9e4bc7dd1bb9d92491c475cec55147fa0b3f954d (patch) | |
| tree | 09a0762e5cee0122892e59d7ab3cd945f2a40d75 /t/t4013/diff.diff-tree_--patch-with-stat_initial | |
| parent | rebase: allow --merge option to handle patches merged upstream (diff) | |
| download | git-9e4bc7dd1bb9d92491c475cec55147fa0b3f954d.tar.gz git-9e4bc7dd1bb9d92491c475cec55147fa0b3f954d.zip | |
rebase: cleanup rebasing with --merge
We no longer have to recommit each patch to remove the parent
information we're rebasing since we're using the low-level merge
strategies directly instead of git-merge.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4013/diff.diff-tree_--patch-with-stat_initial')
0 files changed, 0 insertions, 0 deletions