summaryrefslogtreecommitdiff
path: root/Documentation/git-stash.txt
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-07-04 20:09:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-05 04:12:39 (GMT)
commit1308c17b3e6bd3f5636f5b9bcadb2fbdf559009d (patch)
treeed1ac272833101767363d37c4a5a49d36f4db23c /Documentation/git-stash.txt
parentd97bc5de929e525add9977a9c1ab3834b8c04657 (diff)
downloadgit-1308c17b3e6bd3f5636f5b9bcadb2fbdf559009d.zip
git-1308c17b3e6bd3f5636f5b9bcadb2fbdf559009d.tar.gz
git-1308c17b3e6bd3f5636f5b9bcadb2fbdf559009d.tar.bz2
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 'Documentation/git-stash.txt')
0 files changed, 0 insertions, 0 deletions