summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:28 -0700
commitae1ae600db5e159c4563ee080531b9500c26d635 (patch)
tree95925e9c5cccc44f2aeeaeff65f035e9093d843a /contrib/examples/git-merge-ours.sh
parentMerge branch 'va/i18n' (diff)
parentrebase-interactive: drop early check for valid ident (diff)
downloadtgif-ae1ae600db5e159c4563ee080531b9500c26d635.tar.xz
Merge branch 'jk/rebase-i-drop-ident-check'
Even when "git pull --rebase=preserve" (and the underlying "git rebase --preserve") can complete without creating any new commit (i.e. fast-forwards), it still insisted on having a usable ident information (read: user.email is set correctly), which was less than nice. As the underlying commands used inside "git rebase" would fail with a more meaningful error message and advice text when the bogus ident matters, this extra check was removed. * jk/rebase-i-drop-ident-check: rebase-interactive: drop early check for valid ident
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions