kernel/git - git - PowerEL Git System

6199 Commits

6 Branches

36 Tags

131 MiB

Tree: a41fae9c46

Commit Graph

Author	SHA1	Message	Date
Eric Wong	d5e673b60b	rebase: allow --skip to work with --merge Now that we control the merge base selection, we won't be forced into rolling things in that we wanted to skip beforehand. Also, add a test to ensure this all works as intended. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago

Author

SHA1

Message

Date

Eric Wong

d5e673b60b

rebase: allow --skip to work with --merge

Now that we control the merge base selection, we won't be forced
into rolling things in that we wanted to skip beforehand.

Also, add a test to ensure this all works as intended.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

19 years ago

1 Commits (a41fae9c46a4cb5e59cc1a17d19f6a3a6cbfbb2f)