From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 May 2021 07:59:47 +0000 (+0900)
Subject: Merge branch 'ls/subtree'
X-Git-Tag: v2.32.0-rc0~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44ccb7629a448fd4408f4ff7206df628a31dabed;p=thirdparty%2Fgit.git

Merge branch 'ls/subtree'

"git subtree" updates.

* ls/subtree: (30 commits)
  subtree: be stricter about validating flags
  subtree: push: allow specifying a local rev other than HEAD
  subtree: allow 'split' flags to be passed to 'push'
  subtree: allow --squash to be used with --rejoin
  subtree: give the docs a once-over
  subtree: have $indent actually affect indentation
  subtree: don't let debug and progress output clash
  subtree: add comments and sanity checks
  subtree: remove duplicate check
  subtree: parse revs in individual cmd_ functions
  subtree: use "^{commit}" instead of "^0"
  subtree: don't fuss with PATH
  subtree: use "$*" instead of "$@" as appropriate
  subtree: use more explicit variable names for cmdline args
  subtree: use git-sh-setup's `say`
  subtree: use `git merge-base --is-ancestor`
  subtree: drop support for git < 1.7
  subtree: more consistent error propagation
  subtree: don't have loose code outside of a function
  subtree: t7900: add porcelain tests for 'pull' and 'push'
  ...
---

44ccb7629a448fd4408f4ff7206df628a31dabed