summaryrefslogtreecommitdiff
path: root/Documentation/git-archimport.txt
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-05-04 01:01:29 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-06 13:21:58 +0900
commit8fa6eea0ffd271f0564048dc939987e9640efca5 (patch)
tree0af599a25e6680e388b0bc623e14c184c91ea99a /Documentation/git-archimport.txt
parentrebase --rebase-merges: a "merge" into a new root is a fast-forward (diff)
downloadtgif-8fa6eea0ffd271f0564048dc939987e9640efca5.tar.xz
rebase --rebase-merges: root commits can be cousins, too
Reported by Wink Saville: when rebasing with no-rebase-cousins, we will want to refrain from rebasing all of them, even when they are root commits. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-archimport.txt')
0 files changed, 0 insertions, 0 deletions