{"thread":{"id":"3030","subject":"[PATCH] glossary: explain \"master\" and \"origin\"","startedAt":"2006-01-10T21:26:46Z","lastAt":"2006-01-11T06:12:25Z","messageCount":6,"participants":["Johannes Schindelin","J. Bruce Fields","walt","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"14445","messageId":"Pine.LNX.4.63.0601102226130.649@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"3030","inReplyTo":null,"subject":"[PATCH] glossary: explain \"master\" and \"origin\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-01-10T21:26:46Z","receivedAt":"2006-01-10T21:26:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nIf you are a long time git user/developer, you forget that to a new git\nuser, these words have not the same meaning as to you.\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n\n---\n\n Documentation/glossary.txt |   11 +++++++++++\n 1 files changed, 11 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/glossary.txt b/Documentation/glossary.txt\nindex 2331be5..4ef7d2a 100644\n--- a/Documentation/glossary.txt\n+++ b/Documentation/glossary.txt\n@@ -111,6 +111,17 @@ branch::\n \ta particular revision, which is called the branch head. The\n \tbranch heads are stored in `$GIT_DIR/refs/heads/`.\n \n+master::\n+\tThe default branch. Whenever you create a git repository, a branch\n+\tnamed \"master\" is created, and becomes the active branch. In most\n+\tcases, this contains the local development.\n+\n+origin::\n+\tThe default upstream branch. Most projects have one upstream \n+        project which is tracked, and augmented with local changes which\n+        eventually get merged back. You never commit to this branch,\n+\tunless you are maintaining the upstream project.\n+\n ref::\n \tA 40-byte hex representation of a SHA1 pointing to a particular\n \tobject. These may be stored in `$GIT_DIR/refs/`.\n"},{"id":"14446","messageId":"20060110213645.GF13450@fieldses.org","threadId":"3030","inReplyTo":"Pine.LNX.4.63.0601102226130.649@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] glossary: explain \"master\" and \"origin\"","fromName":"J. Bruce Fields","fromEmail":"bfields@fieldses.org","sentAt":"2006-01-10T21:36:45Z","receivedAt":"2006-01-10T21:36:45Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"On Tue, Jan 10, 2006 at 10:26:46PM +0100, Johannes Schindelin wrote:\n> +origin::\n> +\tThe default upstream branch. Most projects have one upstream \n> +        project which is tracked, and augmented with local changes which\n> +        eventually get merged back. You never commit to this branch,\n> +\tunless you are maintaining the upstream project.\n\nThe last line is somewhat confusing--a naive reader might take it to\nmean that as an upstream maintainer it would make sense to commit to a\nbranch named \"origin\".  How about something like this?\n\n\t\"The default upstream branch.  Most projects have one upstream\n\tproject which they track.  This is is the branch used for\n\ttracking that project.  New updates from upstream will be\n\tfetched into this branch, but you should never commit to it\n\tyourself.\"\n\n--b.\n"},{"id":"14447","messageId":"Pine.LNX.4.63.0601102238570.802@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"3030","inReplyTo":"20060110213645.GF13450@fieldses.org","subject":"Re: [PATCH] glossary: explain \"master\" and \"origin\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-01-10T21:40:36Z","receivedAt":"2006-01-10T21:40:36Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 10 Jan 2006, J. Bruce Fields wrote:\n\n> On Tue, Jan 10, 2006 at 10:26:46PM +0100, Johannes Schindelin wrote:\n> > +origin::\n> > +\tThe default upstream branch. Most projects have one upstream \n> > +        project which is tracked, and augmented with local changes which\n> > +        eventually get merged back. You never commit to this branch,\n> > +\tunless you are maintaining the upstream project.\n> \n> The last line is somewhat confusing--a naive reader might take it to\n> mean that as an upstream maintainer it would make sense to commit to a\n> branch named \"origin\".  How about something like this?\n> \n> \t\"The default upstream branch.  Most projects have one upstream\n> \tproject which they track.  This is is the branch used for\n> \ttracking that project.  New updates from upstream will be\n> \tfetched into this branch, but you should never commit to it\n> \tyourself.\"\n\nIt is probably safer. Note: I actually commit to the origin branch in one \nof my projects, and I follow it directly by a \"git push origin\".\n\nCiao,\nDscho\n\nP.S.: I just noted that some of the tabs were turned into spaces. Does \nasciidoc mind?\n"},{"id":"14450","messageId":"dq1cdd$rob$1@sea.gmane.org","threadId":"3030","inReplyTo":"20060110213645.GF13450@fieldses.org","subject":"Re: [PATCH] glossary: explain \"master\" and \"origin\"","fromName":"walt","fromEmail":"wa1ter@myrealbox.com","sentAt":"2006-01-10T22:27:57Z","receivedAt":"2006-01-10T22:27:57Z","isPatch":true,"sender":{"key":"wa1ter@myrealbox.com","avatar":null},"body":"J. Bruce Fields wrote:\n[...]\n> \tMost projects have one upstream\n> \tproject which they track.  This is is the branch used for\n> \ttracking that project...\n\ns/This/'origin'/\n\nLordy, I think many of the world's problems could be solved just\nby forbidding the use of pronouns entirely!\n"},{"id":"14452","messageId":"dq1g7o$aqh$1@sea.gmane.org","threadId":"3030","inReplyTo":"dq1cdd$rob$1@sea.gmane.org","subject":"Re: [PATCH] glossary: explain \"master\" and \"origin\"","fromName":"walt","fromEmail":"wa1ter@myrealbox.com","sentAt":"2006-01-10T23:33:12Z","receivedAt":"2006-01-10T23:33:12Z","isPatch":true,"sender":{"key":"wa1ter@myrealbox.com","avatar":null},"body":"walt wrote:\n> J. Bruce Fields wrote:\n> [...]\n>> \tMost projects have one upstream\n>> \tproject which they track.  This is is the branch used for\n>> \ttracking that project...\n> \n> s/This/'origin'/\n> \n> Lordy, I think many of the world's problems could be solved just\n> by forbidding the use of pronouns entirely!\n\nNow that I've had another beer, it occurs to me that a 'pronoun'\nis nothing more or less than a 'pointer' to a noun.\n\nWell!  We all know that pointers are a major source of bugs in\nC code.  Is it possible that lint could be taught to detect\nambiguous pronouns in everyday speech?\n"},{"id":"14466","messageId":"7vace3wawm.fsf@assigned-by-dhcp.cox.net","threadId":"3030","inReplyTo":"Pine.LNX.4.63.0601102238570.802@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] glossary: explain \"master\" and \"origin\"","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-01-11T06:12:25Z","receivedAt":"2006-01-11T06:12:25Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> P.S.: I just noted that some of the tabs were turned into spaces. Does \n> asciidoc mind?\n\nProbably not, but I do so I fixed them up myself.\n"}]}