summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-05-15 13:59:06 -0700
committerJunio C Hamano <gitster@pobox.com>2023-05-15 13:59:06 -0700
commitdb13ea835b056afa13ab96c9f96dce011ecc328a (patch)
treed14b1b55a688ce09d09e56d6c09b963576db5fc6
parent85cee30566b26c7463e775e70301ccff52238226 (diff)
parentb4de9239bfbc402738a5755d75a8b90a25c5cfdf (diff)
downloadgit-db13ea835b056afa13ab96c9f96dce011ecc328a.tar.gz
Merge branch 'js/subtree-fully-spelt-quiet-and-debug-options'
"git subtree" (in contrib/) update. * js/subtree-fully-spelt-quiet-and-debug-options: subtree: support long global flags
-rwxr-xr-xcontrib/subtree/git-subtree.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 10c9c87839..7db4c45676 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -34,8 +34,8 @@ git subtree pull --prefix=<prefix> <repository> <ref>
git subtree push --prefix=<prefix> <repository> <refspec>
--
h,help show the help
-q quiet
-d show debug messages
+q,quiet quiet
+d,debug show debug messages
P,prefix= the name of the subdir to split out
options for 'split' (also: 'push')
annotate= add a prefix to commit message of new commits