Merge branch 'ty/merge-tree-strategy-options'

Junio C Hamano committed almost 3 years ago

git-push doc: more visibility for -q option

Michal Suchanek committed almost 3 years ago

rebase: move parse_opt_keep_empty() down

Oswald Buddenhagen committed almost 3 years ago

rebase: handle --strategy via imply_merge() as well

Oswald Buddenhagen committed almost 3 years ago

rebase: simplify code related to imply_merge()

Oswald Buddenhagen committed almost 3 years ago

send-email: handle to/cc/bcc from --compose message

Jeff King committed almost 3 years ago

Revert "send-email: extract email-parsing code into a subroutine"

Jeff King committed almost 3 years ago

doc/send-email: mention handling of "reply-to" with --compose

Jeff King committed almost 3 years ago

commit: ignore_non_trailer computes number of bytes to ignore

Linus Arver committed almost 3 years ago

grep: die gracefully when outside repository

Kristoffer Haugsbakk committed almost 3 years ago

git-p4 shouldn't attempt to store symlinks in LFS

Matthew McClain committed almost 3 years ago

t7601: use "test_path_is_file" etc. instead of "test -f"

Dorcas AnonoLitunya committed almost 3 years ago

am: align placeholder for --whitespace option with apply

Junio C Hamano committed almost 3 years ago

The nineteenth batch

Junio C Hamano committed almost 3 years ago

Merge branch 'jc/merge-ort-attr-index-fix'

Junio C Hamano committed almost 3 years ago

Merge branch 'sn/cat-file-doc-update'

Junio C Hamano committed almost 3 years ago

Merge branch 'xz/commit-title-soft-limit-doc'

Junio C Hamano committed almost 3 years ago

Merge branch 'tb/repack-max-cruft-size'

Junio C Hamano committed almost 3 years ago

commit: do not use cryptic "new_index" in end-user facing messages

Junio C Hamano committed almost 3 years ago

builtin/add.c: clean up die() messages

Naomi Ibe committed almost 3 years ago