diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-10 07:59:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-10 07:59:47 (GMT) |
| commit | 44ccb7629a448fd4408f4ff7206df628a31dabed (patch) | |
| tree | ebe0308a9f041e57179316bc25d0fb0424dba5e8 /.gitignore | |
| parent | aaa3c8065d86e8f25850eb79e90da68d6adcf03f (diff) | |
| parent | 9a3e3ca2ba869f9fef9f8be390ed45457565ccd1 (diff) | |
| download | git-44ccb7629a448fd4408f4ff7206df628a31dabed.zip git-44ccb7629a448fd4408f4ff7206df628a31dabed.tar.gz git-44ccb7629a448fd4408f4ff7206df628a31dabed.tar.bz2 | |
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'
...
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -163,6 +163,7 @@ /git-stripspace /git-submodule /git-submodule--helper +/git-subtree /git-svn /git-switch /git-symbolic-ref |