| Message ID | 20200818052248.1880-1-danny0838@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ce820cbd584171a2d09c0ce5b9cfb5756b8c9af6 |
| Headers | show |
| Series | contrib/subtree: document 'push' does not take '--squash' | expand |
Danny Lin <danny0838@gmail.com> writes: > git subtree push does not support --squash, as previously illustrated in > 6ccc71a9 (contrib/subtree: there's no push --squash, 2015-05-07) > > Signed-off-by: Danny Lin <danny0838@gmail.com> > --- > contrib/subtree/git-subtree.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks. Will queue both patches. > diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt > index 9ccd431c7f..0db02fe3c0 100644 > --- a/contrib/subtree/git-subtree.txt > +++ b/contrib/subtree/git-subtree.txt > @@ -143,8 +143,8 @@ OPTIONS > Specify <message> as the commit message for the merge commit. > > > -OPTIONS FOR add, merge, push, pull > ----------------------------------- > +OPTIONS FOR add, merge, and pull > +-------------------------------- > --squash:: > This option is only valid for add, merge, and pull > commands.
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 9ccd431c7f..0db02fe3c0 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -143,8 +143,8 @@ OPTIONS Specify <message> as the commit message for the merge commit. -OPTIONS FOR add, merge, push, pull ----------------------------------- +OPTIONS FOR add, merge, and pull +-------------------------------- --squash:: This option is only valid for add, merge, and pull commands.
git subtree push does not support --squash, as previously illustrated in 6ccc71a9 (contrib/subtree: there's no push --squash, 2015-05-07) Signed-off-by: Danny Lin <danny0838@gmail.com> --- contrib/subtree/git-subtree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)