diff options
author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-07-04 22:09:10 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-07-04 21:12:39 -0700 |
commit | 1308c17b3e6bd3f5636f5b9bcadb2fbdf559009d (patch) | |
tree | ed1ac272833101767363d37c4a5a49d36f4db23c /builtin-check-attr.c | |
parent | d97bc5de929e525add9977a9c1ab3834b8c04657 (diff) | |
download | git-1308c17b3e6bd3f5636f5b9bcadb2fbdf559009d.tar.gz |
Allow rebase to run if upstream is completely merged
Consider this history:
o--o-...-B <- origin
\ \
x--x--M--x--x <- master
In this situation, rebase considers master fully up-to-date and would
not do anything. However, if there were additional commits on origin,
the rebase would run and move the commits x on top of origin.
Here we change rebase to short-circuit out only if the history since origin
is strictly linear. Consequently, the above as well as a history like this
would be linearized:
o--o <- origin
\
x--x
\ \
x--M--x--x <- master
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-check-attr.c')
0 files changed, 0 insertions, 0 deletions