Re: Rebasing multiple branches

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Please don't cull the Cc lists.  Unless he's subscribed, Leonid never
got your reply!

Enrico Weigelt wrote:
> * Leonid Podolny <leonidp.lists@xxxxxxxxx> wrote:
> 
> > Ah, nice. I didn't notice the -p option. However, the man page advises 
> > against using -p and -i together.
> 
> Last time I checked, -i required -p ...

-p internally implies -i, but the user doesn't have to know that ;-)

The problem is that the todo file language is not expressive enough
for what -p needs to do.  Running a rebase -p without changing the
todo file should behave reasonably.  On the other hand, if you
rearrange or extend the todo file in many cases that gives unexpected
results.

Hence the recommendation to not use it with -i.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]