{"thread":{"id":"32230","subject":"[PATCH] submodule update: document exisiting -r form for --rebase","startedAt":"2012-11-28T18:28:22Z","lastAt":"2012-11-28T20:08:33Z","messageCount":4,"participants":["W. Trevor King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"204182","messageId":"0450c75cbab3119ea830e8e8e3484649062377d8.1354127227.git.wking@tremily.us","threadId":"32230","inReplyTo":null,"subject":"[PATCH] submodule update: document exisiting -r form for --rebase","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2012-11-28T18:28:22Z","receivedAt":"2012-11-28T18:28:22Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"From: \"W. Trevor King\" <wking@tremily.us>\n\nSigned-off-by: W. Trevor King <wking@tremily.us>\n---\n Documentation/git-submodule.txt | 3 ++-\n git-submodule.sh                | 2 +-\n 2 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\nindex b4683bb..ec78fa7 100644\n--- a/Documentation/git-submodule.txt\n+++ b/Documentation/git-submodule.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n \t      [--reference <repository>] [--] <repository> [<path>]\n 'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]\n 'git submodule' [--quiet] init [--] [<path>...]\n-'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase]\n+'git submodule' [--quiet] update [--init] [-N|--no-fetch] [-r|--rebase]\n \t      [--reference <repository>] [--merge] [--recursive] [--] [<path>...]\n 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]\n \t      [commit] [--] [<path>...]\n@@ -251,6 +251,7 @@ OPTIONS\n \tIf the key `submodule.$name.update` is set to `merge`, this option is\n \timplicit.\n \n+-r::\n --rebase::\n \tThis option is only valid for the update command.\n \tRebase the current branch onto the commit recorded in the\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex ab6b110..f2e8026 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -8,7 +8,7 @@ dashless=$(basename \"$0\" | sed -e 's/-/ /')\n USAGE=\"[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]\n    or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]\n    or: $dashless [--quiet] init [--] [<path>...]\n-   or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]\n+   or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [-r|--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]\n    or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]\n    or: $dashless [--quiet] foreach [--recursive] <command>\n    or: $dashless [--quiet] sync [--] [<path>...]\"\n-- \n1.8.0.2.gcc766b6\n"},{"id":"204186","messageId":"7vboehv9d6.fsf@alter.siamese.dyndns.org","threadId":"32230","inReplyTo":"0450c75cbab3119ea830e8e8e3484649062377d8.1354127227.git.wking@tremily.us","subject":"Re: [PATCH] submodule update: document exisiting -r form for --rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-28T19:02:45Z","receivedAt":"2012-11-28T19:02:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"W. Trevor King\" <wking@tremily.us> writes:\n\n> From: \"W. Trevor King\" <wking@tremily.us>\n>\n> Signed-off-by: W. Trevor King <wking@tremily.us>\n> ---\n>  Documentation/git-submodule.txt | 3 ++-\n>  git-submodule.sh                | 2 +-\n>  2 files changed, 3 insertions(+), 2 deletions(-)\n\nHmm, I wonder why I have this funny feeling that this was proposed\nand rejected already...\n\nAs the command takes other options whose names begin with 'r', I\nthought the longer term plan was to stop letting \"--rebase\" squat on\nshort and sweet \"-r\" and leaving it undocumented (even though the\nshort one was added by mistake) was meant to be the first step in\nthat process.\n\nBut maybe I am confusing an undocumented single-letter option from\nsome other subcommand.  Anybody remembers?\n\n> diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\n> index b4683bb..ec78fa7 100644\n> --- a/Documentation/git-submodule.txt\n> +++ b/Documentation/git-submodule.txt\n> @@ -13,7 +13,7 @@ SYNOPSIS\n>  \t      [--reference <repository>] [--] <repository> [<path>]\n>  'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]\n>  'git submodule' [--quiet] init [--] [<path>...]\n> -'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase]\n> +'git submodule' [--quiet] update [--init] [-N|--no-fetch] [-r|--rebase]\n>  \t      [--reference <repository>] [--merge] [--recursive] [--] [<path>...]\n>  'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]\n>  \t      [commit] [--] [<path>...]\n> @@ -251,6 +251,7 @@ OPTIONS\n>  \tIf the key `submodule.$name.update` is set to `merge`, this option is\n>  \timplicit.\n>  \n> +-r::\n>  --rebase::\n>  \tThis option is only valid for the update command.\n>  \tRebase the current branch onto the commit recorded in the\n> diff --git a/git-submodule.sh b/git-submodule.sh\n> index ab6b110..f2e8026 100755\n> --- a/git-submodule.sh\n> +++ b/git-submodule.sh\n> @@ -8,7 +8,7 @@ dashless=$(basename \"$0\" | sed -e 's/-/ /')\n>  USAGE=\"[--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]\n>     or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]\n>     or: $dashless [--quiet] init [--] [<path>...]\n> -   or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]\n> +   or: $dashless [--quiet] update [--init] [-N|--no-fetch] [-f|--force] [-r|--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]\n>     or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]\n>     or: $dashless [--quiet] foreach [--recursive] <command>\n>     or: $dashless [--quiet] sync [--] [<path>...]\"\n"},{"id":"204193","messageId":"20121128194216.GA22202@odin.tremily.us","threadId":"32230","inReplyTo":"7vboehv9d6.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2012-11-28T19:42:16Z","receivedAt":"2012-11-28T19:42:16Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"On Wed, Nov 28, 2012 at 11:02:45AM -0800, Junio C Hamano wrote:\n> \"W. Trevor King\" <wking@tremily.us> writes:\n> \n> > From: \"W. Trevor King\" <wking@tremily.us>\n> >\n> > Signed-off-by: W. Trevor King <wking@tremily.us>\n> > ---\n> >  Documentation/git-submodule.txt | 3 ++-\n> >  git-submodule.sh                | 2 +-\n> >  2 files changed, 3 insertions(+), 2 deletions(-)\n> \n> Hmm, I wonder why I have this funny feeling that this was proposed\n> and rejected already...\n> \n> As the command takes other options whose names begin with 'r', I\n> thought the longer term plan was to stop letting \"--rebase\" squat on\n> short and sweet \"-r\" and leaving it undocumented (even though the\n> short one was added by mistake) was meant to be the first step in\n> that process.\n> \n> But maybe I am confusing an undocumented single-letter option from\n> some other subcommand.  Anybody remembers?\n\nPerhaps you are remembering:\n\nOn Sun, Nov 11, 2012 at 02:33:45AM -0800, Junio C Hamano wrote:\n> Ah, this reminds me of another thing I noticed when I saw that\n> patch.  The change seems to think \"branch\" is the _only_ thing the\n> user might want to record per submodule upon \"git submodule add\".\n> As an interface to muck with an uninterpreted random configuration,\n> it squats on a good option name for setting one single and arbitrary\n> variable---quite a selfish change that is not acceptable.\n> \n> Calling the option \"--record-branch-for-submodule\" or something more\n> specific might alleviate the problem, but then it would become even\n> less useful as a short-hand for \"config submodule.$name.branch\", I\n> would suspect.\n\nWith this recent patch, I'm just documenting someone else's squatting\n;).  But yes, the reason I noticed was because I was tempted to make\nthe same mistake again :p.  In my defense, I think `update --remote`\nis a good deal more general than my earlier `add --record`.\n\nCheers,\nTrevor\n\n-- \nThis email may be signed or encrypted with GnuPG (http://www.gnupg.org).\nFor more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\n"},{"id":"204196","messageId":"7vy5hltrr2.fsf@alter.siamese.dyndns.org","threadId":"32230","inReplyTo":"20121128194216.GA22202@odin.tremily.us","subject":"Re: [PATCH v3 1/3] git-submodule add: Add -r/--record option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-28T20:08:33Z","receivedAt":"2012-11-28T20:08:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"W. Trevor King\" <wking@tremily.us> writes:\n\n>> As the command takes other options whose names begin with 'r', I\n>> thought the longer term plan was to stop letting \"--rebase\" squat on\n>> short and sweet \"-r\" and leaving it undocumented (even though the\n>> short one was added by mistake) was meant to be the first step in\n>> that process.\n>> \n>> But maybe I am confusing an undocumented single-letter option from\n>> some other subcommand.  Anybody remembers?\n>\n> Perhaps you are remembering:\n>\n> On Sun, Nov 11, 2012 at 02:33:45AM -0800, Junio C Hamano wrote:\n>> Ah, this reminds me of another thing I noticed when I saw that\n>> ...\n\nNo.  The discussion might or might not be the \"-r\" option to\n\"submodule update\", but even if it were so, I wasn't refering to\nthat exchange but something more in the further past.\n"}]}