summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-06 14:45:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-06 14:45:44 -0700
commit89d3eafe9019b407d6b2cf8913c6845bde50b178 (patch)
treefcfdaf135f8c67c35f093048e6d6b35e4caa883a /.gitattributes
parentMerge branch 'jc/drop-git-spec-in' (diff)
parentgit-rebase--merge: don't include absent parent as a base (diff)
downloadtgif-89d3eafe9019b407d6b2cf8913c6845bde50b178.tar.xz
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 '.gitattributes')
0 files changed, 0 insertions, 0 deletions