Junio C Hamano fa1b86e457 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

2019-04-10 02:14:24 +09:00

..

add.c

…

am.c

Merge branch 'nd/completion-more-parameters'

2019-03-07 09:59:58 +09:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

…

blame.c

…

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jh/trace2'

2019-03-07 09:59:56 +09:00

clean.c

…

clone.c

…

column.c

…

commit-graph.c

…

commit-tree.c

commit-tree: utilize parse-options api

2019-03-08 10:31:24 +09:00

commit.c

Merge branch 'nd/completion-more-parameters'

2019-03-07 09:59:58 +09:00

config.c

…

count-objects.c

…

credential.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

Merge branch 'en/combined-all-paths'

2019-03-07 09:59:54 +09:00

diff.c

Merge branch 'jk/diff-no-index-initialize'

2019-03-07 09:59:59 +09:00

difftool.c

…

fast-export.c

…

fetch-pack.c

…

fetch.c

Merge branch 'jk/no-sigpipe-during-network-transport'

2019-03-20 15:16:06 +09:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

Merge branch 'jk/fsck-doc'

2019-03-20 15:16:06 +09:00

gc.c

…

get-tar-commit-id.c

…

grep.c

…

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

Merge branch 'ma/clear-repository-format'

2019-03-20 15:16:07 +09:00

interpret-trailers.c

…

log.c

…

ls-files.c

…

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

…

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

…

pack-redundant.c

Merge branch 'sc/pack-redundant'

2019-03-07 09:59:54 +09:00

pack-refs.c

…

patch-id.c

…

prune-packed.c

Merge branch 'rj/prune-packed-excess-args'

2019-03-07 09:59:55 +09:00

prune.c

…

pull.c

…

push.c

…

range-diff.c

…

read-tree.c

…

rebase--interactive.c

…

rebase.c

Merge branch 'js/rebase-deprecate-preserve-merges'

2019-04-10 02:14:24 +09:00

receive-pack.c

Merge branch 'ab/receive-pack-use-after-free-fix'

2019-03-07 09:59:57 +09:00

reflog.c

…

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

…

replace.c

…

rerere.c

…

reset.c

…

rev-list.c

Merge branch 'jk/virtual-objects-do-exist'

2019-03-20 15:16:07 +09:00

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

…

serve.c

…

shortlog.c

…

show-branch.c

…

show-index.c

…

show-ref.c

…

stripspace.c

…

submodule--helper.c

…

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'ms/worktree-add-atomic-mkdir'

2019-04-10 02:14:24 +09:00

write-tree.c

…