summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-06 14:45:44 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-06 14:45:44 -0700
commit89d3eafe9019b407d6b2cf8913c6845bde50b178 (patch)
treefcfdaf135f8c67c35f093048e6d6b35e4caa883a /merge-recursive.c
parent54b0ac57ab90c233a5a076904173c82e3d7db509 (diff)
parent79f43447d2b542d1e521987287822ff376d43e93 (diff)
downloadgit-89d3eafe9019b407d6b2cf8913c6845bde50b178.tar.gz
Merge branch 'bw/rebase-merge-entire-branch'
"git rebase -m" could be asked to rebase an entire branch starting from the root, but failed by assuming that there always is a parent commit to the first commit on the branch. * bw/rebase-merge-entire-branch: git-rebase--merge: don't include absent parent as a base
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions