Merge branch 'cb/grep-pcre-ucp'

Junio C Hamano committed over 3 years ago

Merge branch 'sa/cat-file-mailmap--batch-check'

Junio C Hamano committed over 3 years ago

Merge branch 'ab/cache-api-cleanup-users'

Junio C Hamano committed over 3 years ago

attr: fix instructions on how to check attrs

John Cai committed over 3 years ago

request-pull: filter out SSH/X.509 tag signatures

Gwyneth Morgan committed over 3 years ago

rebase: provide better error message for apply options vs. merge config

Elijah Newren committed over 3 years ago

rebase: put rebase_options initialization in single place

Elijah Newren committed over 3 years ago

rebase: fix formatting of rebase --reapply-cherry-picks option in docs

Elijah Newren committed over 3 years ago

rebase: clarify the OPT_CMDMODE incompatibilities

Elijah Newren committed over 3 years ago

rebase: add coverage of other incompatible options

Elijah Newren committed over 3 years ago

rebase: fix incompatiblity checks for --[no-]reapply-cherry-picks

Elijah Newren committed over 3 years ago

rebase: fix docs about incompatibilities with --root

Elijah Newren committed over 3 years ago

rebase: remove --allow-empty-message from incompatible opts

Elijah Newren committed over 3 years ago

rebase: flag --apply and --merge as incompatible

Elijah Newren committed over 3 years ago

rebase: mark --update-refs as requiring the merge backend

Elijah Newren committed over 3 years ago

ssh signing: better error message when key not in agent

Adam Szkoda committed over 3 years ago

Merge branch 'ab/makeflags'

Pratyush Yadav committed over 3 years ago

Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4

Ævar Arnfjörð Bjarmason committed over 3 years ago

dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS

Taylor Blau committed over 3 years ago

clone: delay picking a transport until after get_repo_path()

Taylor Blau committed over 3 years ago