summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-01 13:39:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-01 13:39:58 -0700
commit6d6b412da32229bf6a5f366a72b5ad29cc70ce59 (patch)
treeb7536738d6dec7ff9cd60a9a891cc5e3e9f7e12e /Makefile
parentMerge branch 'ds/build-homebrew-gettext-fix' (diff)
parentrebase: display an error if --root and --fork-point are both provided (diff)
downloadtgif-6d6b412da32229bf6a5f366a72b5ad29cc70ce59.tar.xz
Merge branch 'en/rebase-root-and-fork-point-are-incompatible'
Incompatible options "--root" and "--fork-point" of "git rebase" have been marked and documented as being incompatible. * en/rebase-root-and-fork-point-are-incompatible: rebase: display an error if --root and --fork-point are both provided
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions