Merge branch 'jk/promisor-optim'

Junio C Hamano committed over 5 years ago

bisect--helper: use BISECT_TERMS in 'bisect skip' command

Ramsay Jones committed over 5 years ago

cygwin: disallow backslashes in file names

Adam Dinwoodie committed over 5 years ago

git: support separate arg for `--config-env`'s value

Patrick Steinhardt committed over 5 years ago

git.txt: fix synopsis of `--config-env` missing the equals sign

Patrick Steinhardt committed over 5 years ago

apply: adjust messages to account for --3way changes

Jerry Zhang committed over 5 years ago

prune: save reachable-from-recent objects with bitmaps

Jeff King committed over 5 years ago

pack-bitmap: clean up include_check after use

Jeff King committed over 5 years ago

subtree: be stricter about validating flags

Luke Shumaker committed over 5 years ago

subtree: push: allow specifying a local rev other than HEAD

Luke Shumaker committed over 5 years ago

subtree: allow 'split' flags to be passed to 'push'

Luke Shumaker committed over 5 years ago

subtree: allow --squash to be used with --rejoin

Luke Shumaker committed over 5 years ago

subtree: give the docs a once-over

Luke Shumaker committed over 5 years ago

subtree: have $indent actually affect indentation

Luke Shumaker committed over 5 years ago

subtree: don't let debug and progress output clash

Luke Shumaker committed over 5 years ago

subtree: add comments and sanity checks

Luke Shumaker committed over 5 years ago

subtree: remove duplicate check

Luke Shumaker committed over 5 years ago

subtree: parse revs in individual cmd_ functions

Luke Shumaker committed over 5 years ago

subtree: use "^{commit}" instead of "^0"

Luke Shumaker committed over 5 years ago

subtree: don't fuss with PATH

Luke Shumaker committed over 5 years ago