* --squash has no effect in git subtree push? @ 2015-05-04 13:58 Danny Lin 2015-05-07 7:52 ` Danny Lin 0 siblings, 1 reply; 3+ messages in thread From: Danny Lin @ 2015-05-04 13:58 UTC (permalink / raw) To: git The document says that --squash is for 'add', 'merge', 'pull' and 'push'. However, it seems that --squash has no effect for push. Am I doing something wrong or is the document outdated? git version 2.3.7.windows.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: --squash has no effect in git subtree push? 2015-05-04 13:58 --squash has no effect in git subtree push? Danny Lin @ 2015-05-07 7:52 ` Danny Lin 2015-05-07 18:05 ` Junio C Hamano 0 siblings, 1 reply; 3+ messages in thread From: Danny Lin @ 2015-05-07 7:52 UTC (permalink / raw) To: git develop Subject: [PATCH] contrib/subtree: there's no push --squash The documentation says that --squash is for 'add', 'merge', 'pull' and 'push', while --squash actually doesn't change the behavior of 'push'. Correct the documentation. Signed-off-by: Danny Lin <danny0838@gmail.com> --- contrib/subtree/git-subtree.sh | 2 +- contrib/subtree/git-subtree.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index fa1a583..6328c87 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -26,7 +26,7 @@ b,branch= create a new branch from the split subtree ignore-joins ignore prior --rejoin commits onto= try connecting new tree to an existing one rejoin merge the new branch back into HEAD - options for 'add', 'merge', 'pull' and 'push' + options for 'add', 'merge', and 'pull' squash merge subtree changes as a single commit " eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)" diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 54e4b4a..60d76cd 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -146,7 +146,7 @@ OPTIONS OPTIONS FOR add, merge, push, pull ---------------------------------- --squash:: - This option is only valid for add, merge, push and pull + This option is only valid for add, merge, and pull commands. + Instead of merging the entire history from the subtree project, produce -- 2.3.7.windows.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: --squash has no effect in git subtree push? 2015-05-07 7:52 ` Danny Lin @ 2015-05-07 18:05 ` Junio C Hamano 0 siblings, 0 replies; 3+ messages in thread From: Junio C Hamano @ 2015-05-07 18:05 UTC (permalink / raw) To: Danny Lin; +Cc: git develop Danny Lin <danny0838@gmail.com> writes: > diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt > index 54e4b4a..60d76cd 100644 > --- a/contrib/subtree/git-subtree.txt > +++ b/contrib/subtree/git-subtree.txt > @@ -146,7 +146,7 @@ OPTIONS > OPTIONS FOR add, merge, push, pull > ---------------------------------- > --squash:: > - This option is only valid for add, merge, push and pull > + This option is only valid for add, merge, and pull You seem to have lost leading TABs in the patch somehow. I manually typed the same change and commited, so no need to resend this one, but for future reference, please try sending a patch to yourself (and nobody else) and make sure what you reeived applies cleanly with "git am" on the commit you based your patch on. And if it doesn't, figure out where tabs are eaten and lines are wrapped and fix that problem before sending the patch to the list. Thanks. ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-07 18:05 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-05-04 13:58 --squash has no effect in git subtree push? Danny Lin 2015-05-07 7:52 ` Danny Lin 2015-05-07 18:05 ` Junio C Hamano
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.