summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-11-10 09:02:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-10 09:02:13 (GMT)
commit0c51181ffb178a6581ecb471091cbd2d0c48f165 (patch)
tree475fe1611bbc83b20280597491f20f2ab3ac50ba /merge-recursive.c
parent8f40d897834c9c60ebab3d34607a5b8a7f33163d (diff)
parentfeebd2d256adffa6a1e31832266ee9466a63c0c2 (diff)
downloadgit-0c51181ffb178a6581ecb471091cbd2d0c48f165.zip
git-0c51181ffb178a6581ecb471091cbd2d0c48f165.tar.gz
git-0c51181ffb178a6581ecb471091cbd2d0c48f165.tar.bz2
Merge branch 'js/rebase-deprecate-preserve-merges'
"git rebase --preserve-merges" has been marked as deprecated; this release stops advertising it in the "git rebase -h" output. * js/rebase-deprecate-preserve-merges: rebase: hide --preserve-merges option
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions