summaryrefslogtreecommitdiff
path: root/Documentation/pretty-formats.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-10 02:14:24 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-10 02:14:24 +0900
commitfa1b86e45743fd5895c33adcd3769782e608bb40 (patch)
tree75ae7fdfcddad4fd8039ca66b498cc8128bedc4c /Documentation/pretty-formats.txt
parentMerge branch 'ms/worktree-add-atomic-mkdir' (diff)
parentrebase: deprecate --preserve-merges (diff)
downloadtgif-fa1b86e45743fd5895c33adcd3769782e608bb40.tar.xz
Merge branch 'js/rebase-deprecate-preserve-merges'
"git rebase --rebase-merges" replaces its old "--preserve-merges" option; the latter is now marked as deprecated. * js/rebase-deprecate-preserve-merges: rebase: deprecate --preserve-merges
Diffstat (limited to 'Documentation/pretty-formats.txt')
0 files changed, 0 insertions, 0 deletions