From jay.krell at cornell.edu Wed Dec 10 13:20:33 2014 From: jay.krell at cornell.edu (Jay K) Date: Wed, 10 Dec 2014 12:20:33 +0000 Subject: [M3devel] getting started with git? Message-ID: I have been struggingly to do anything with git. Just me? Please help? I understand that everyone gets a copy of the repository, so viewing history is fast and disconnected. I understand I get to commit locally so that I can commit willy nilly and nobody will notice or mind. I understand that after I commit locally willy nilly, I can "combine" many small commits into one commit, so that when eventually my changes are shared, while the history might be hierarchical/branched, it won't be too noisy. Those are all good selling points. Now, things I don't understand. Besides my local repository, is github also hosting a fork just for me? I commit to that "somewhat willy nilly"? This seems like a somewhat redundant extra layer. And then, "third level of the hierarchy", occasionally my github repository is merged with the master? I submit a pull request? I haven't figured out how. And who handles them? Or it is automatic? But how to stop arbitrary edits then? i.e. how to approve people? There is more I don't understand. Like, in CVS and Perforce I am accustomed to multiple clients/checkouts/enlistments, for separate work, or for "buddy builds". But that shouldn't require a whole additional repository full of history. What is the analog in Git? Alternatively, can some write up the following workflows: 1. start from scratch 2. get a file edited in the mainline 3. and then undone 1. start from scratch 2. get a file added in the mainline. 3. and then edited So much documentation talks about tangential scenarios, like "git init" which I don't think is relevant. also, I find git status is quite slow. So much for offline and disconnected. Is there a mode where, like: 1) files are read only by default 2) I have to run git to make them writable 3) It will remember, quickly? I am thoroughly familiar with and happy with perforce, so explanations that attempt to compare/contract/reuse-vocabulary with it are welcome. Thanks, - Jay -------------- next part -------------- An HTML attachment was scrubbed... URL: From rodney_bates at lcwb.coop Wed Dec 10 15:29:29 2014 From: rodney_bates at lcwb.coop (Rodney M. Bates) Date: Wed, 10 Dec 2014 08:29:29 -0600 Subject: [M3devel] getting started with git? In-Reply-To: References: Message-ID: <548858C9.4060608@lcwb.coop> I'm pretty new at git too, so my impressions are tenuous On 12/10/2014 06:20 AM, Jay K wrote: > I have been struggingly to do anything with git. > Just me? > Please help? > > > I understand that everyone gets a copy of the repository, so viewing history > is fast and disconnected. > > > I understand I get to commit locally so that I can commit willy nilly and nobody > will notice or mind. > > > I understand that after I commit locally willy nilly, I can "combine" many > small commits into one commit, so that when eventually my changes are shared, > while the history might be hierarchical/branched, it won't be too noisy. > Hmm, I haven't read about anything like this. What are the commands to do it? The only thing I have done is to push to github, which puts all of my separate local commits into github, all separate there too,, not aggregated. > > Those are all good selling points. > > > Now, things I don't understand. > > > Besides my local repository, is github also hosting a fork just for me? This is not my understanding. I think github has just one repository, which periodically gets your changes added when you push to it. > > > I commit to that "somewhat willy nilly"? > This seems like a somewhat redundant extra layer. > > > And then, "third level of the hierarchy", occasionally my github > repository is merged with the master? > Perhaps you are referring to having your own branch. If you create a branch locally, then push that branch, the central repo also gets a copy of the branch, with all its history. The branch name is an operand of the 'push' command, probably defaulting to 'master' if omitted. 'master' is the name of the initial branch, and you can merge any other branch into it. This works the same within your local repo or within the guthub one. I think the right procedure would be to merge your branch into 'master', all locally, fixing any problems there. Then push your local, now-merged master to github. (And, just for backup/completeness, probably also push your branch to github too.) I think you could alternatively push your branch to github, then, in github, merge the branch into 'master' there. This would probably make the github repo temporarily difficult/impossible for others to use, if there were any merge conflicts. Seems like a bad procedure. (Or, does git precheck for conflicts and refuse to carry out the merge until they have been fixed?) After that, you'd still need to pull master from github, to get the merged changes back into your local repo. > > I submit a pull request? > I haven't figured out how. 'pull' is a git command you can issue locally, naming the remote repo (and the branch) you want to pull from. With the remote repo URL omitted, it pulls from the one you originally cloned from. That is remembered somewhere locally. You can examine/edit the URL with some command, I think 'remote'. (push defaults to this URL too.) What I have been unable to do is get an explicit repo URL in a pull or push command to work. Every spelling I try either silently and immediately returns a prompt, with no evidence anything happened, or gives a error message criticizing the repo URL as if it were supposed to be a branch name or something other than a URL.. > And who handles them? > Or it is automatic? But how to stop arbitrary edits then? I am quite certain it is not automatic. You have to explicitly pull. Somebody else with their own local repo can push it to yours, but you have to have given them permission somehow. I doubt the github repo will ever get pushed to yours. > i.e. how to approve people? > > > There is more I don't understand. > Like, in CVS and Perforce I am accustomed to multiple clients/checkouts/enlistments, > for separate work, or for "buddy builds". > > > But that shouldn't require a whole additional repository full of history. > > > What is the analog in Git? > > Alternatively, can some write up the following workflows: > > 1. start from scratch > 2. get a file edited in the mainline > 3. and then undone > > 1. start from scratch > 2. get a file added in the mainline. > 3. and then edited > > > So much documentation talks about tangential scenarios, like "git init" which I don't think is relevant. > > also, I find git status is quite slow. > So much for offline and disconnected. > Is there a mode where, like: > 1) files are read only by default > 2) I have to run git to make them writable > 3) It will remember, quickly? > > I am thoroughly familiar with and happy with perforce, so explanations > that attempt to compare/contract/reuse-vocabulary with it are welcome. > > > Thanks, > - Jay > > -- Rodney Bates rodney.m.bates at acm.org From wagner at elego.de Wed Dec 10 18:12:45 2014 From: wagner at elego.de (Olaf Wagner) Date: Wed, 10 Dec 2014 18:12:45 +0100 Subject: [M3devel] getting started with git? In-Reply-To: <548858C9.4060608@lcwb.coop> References: <548858C9.4060608@lcwb.coop> Message-ID: <20141210181245.e8b24940688af0492819c5e6@elego.de> On Wed, 10 Dec 2014 08:29:29 -0600 "Rodney M. Bates" wrote: > I'm pretty new at git too, so my impressions are tenuous > > On 12/10/2014 06:20 AM, Jay K wrote: [...] > > I submit a pull request? > > I haven't figured out how. > > 'pull' is a git command you can issue locally, naming the remote > repo (and the branch) you want to pull from. With the remote repo URL > omitted, it pulls from the one you originally cloned from. That is > remembered somewhere locally. You can examine/edit the URL with some > command, I think 'remote'. (push defaults to this URL too.) > > What I have been unable to do is get an explicit repo URL in > a pull or push command to work. Every spelling I try either silently > and immediately returns a prompt, with no evidence anything happened, > or gives a error message criticizing the repo URL as if it were supposed > to be a branch name or something other than a URL.. > > > And who handles them? > > Or it is automatic? But how to stop arbitrary edits then? > > I am quite certain it is not automatic. You have to explicitly pull. > > Somebody else with their own local repo can push it to yours, but you > have to have given them permission somehow. I doubt the github repo > will ever get pushed to yours. You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': http://git-scm.com/docs/git-pull I'm not sure if the small number of m3 developers will need pull requests for their collaboration. Olaf -- Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 From jay.krell at cornell.edu Thu Dec 11 01:08:40 2014 From: jay.krell at cornell.edu (Jay K) Date: Thu, 11 Dec 2014 00:08:40 +0000 Subject: [M3devel] getting started with git? In-Reply-To: <20141210181245.e8b24940688af0492819c5e6@elego.de> References: , <548858C9.4060608@lcwb.coop>, <20141210181245.e8b24940688af0492819c5e6@elego.de> Message-ID: I wasn't clear. I see no need for me to have my own github hosted repository. I might have "fell" into having it through. I'd just like to have the one "master" on github and an unavoidable local repo. (just one local? or a few?) I'd like to push to master. Can this work? And then, who controls who is allowed to push to master? Surely it isn't just world-writable. Or I must push to github-hosted-jaykrell and then someone/everyone must pull from github-hosted-jaykrell? Thanks, - Jay > Date: Wed, 10 Dec 2014 18:12:45 +0100 > From: wagner at elego.de > To: rodney.m.bates at acm.org > CC: m3devel at elegosoft.com > Subject: Re: [M3devel] getting started with git? > > On Wed, 10 Dec 2014 08:29:29 -0600 > "Rodney M. Bates" wrote: > > > I'm pretty new at git too, so my impressions are tenuous > > > > On 12/10/2014 06:20 AM, Jay K wrote: > [...] > > > I submit a pull request? > > > I haven't figured out how. > > > > 'pull' is a git command you can issue locally, naming the remote > > repo (and the branch) you want to pull from. With the remote repo URL > > omitted, it pulls from the one you originally cloned from. That is > > remembered somewhere locally. You can examine/edit the URL with some > > command, I think 'remote'. (push defaults to this URL too.) > > > > What I have been unable to do is get an explicit repo URL in > > a pull or push command to work. Every spelling I try either silently > > and immediately returns a prompt, with no evidence anything happened, > > or gives a error message criticizing the repo URL as if it were supposed > > to be a branch name or something other than a URL.. > > > > > And who handles them? > > > Or it is automatic? But how to stop arbitrary edits then? > > > > I am quite certain it is not automatic. You have to explicitly pull. > > > > Somebody else with their own local repo can push it to yours, but you > > have to have given them permission somehow. I doubt the github repo > > will ever get pushed to yours. > > You're talking about two different things. See > https://help.github.com/articles/using-pull-requests/ > for pull requests on github, wile 'git pull' is just > a combination of 'git fetch' and 'git merge': > > http://git-scm.com/docs/git-pull > > I'm not sure if the small number of m3 developers will need > pull requests for their collaboration. > > Olaf > -- > Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com > Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany > phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 > Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin > Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 -------------- next part -------------- An HTML attachment was scrubbed... URL: From rcolebur at SCIRES.COM Thu Dec 11 01:10:30 2014 From: rcolebur at SCIRES.COM (Coleburn, Randy) Date: Thu, 11 Dec 2014 00:10:30 +0000 Subject: [M3devel] getting started with git? Message-ID: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> I must confess that I am totally lost at this point wrt github. I understood what was going on with CVS and used TortoiseCVS to make it easy to keep my local repo up-to-date and submit changes to the repository. I need to spend some time learning the new system. Can someone point me to the "fast start" web pages so I can figure out what I need to do. Also, I am losing this email address before the end of the year, so I need to transition all my cm3 mail list subscriptions to a new email address. I don't want to post that address here, but if someone can tell me who to contact to make the change, I would appreciate it. Thanks, Randy Coleburn -----Original Message----- From: Olaf Wagner [mailto:wagner at elego.de] Sent: Wednesday, December 10, 2014 12:13 PM To: rodney.m.bates at acm.org Cc: m3devel at elegosoft.com Subject: EXT:Re: [M3devel] getting started with git? On Wed, 10 Dec 2014 08:29:29 -0600 "Rodney M. Bates" wrote: > I'm pretty new at git too, so my impressions are tenuous > > On 12/10/2014 06:20 AM, Jay K wrote: [...] > > I submit a pull request? > > I haven't figured out how. > > 'pull' is a git command you can issue locally, naming the remote repo > (and the branch) you want to pull from. With the remote repo URL > omitted, it pulls from the one you originally cloned from. That is > remembered somewhere locally. You can examine/edit the URL with some > command, I think 'remote'. (push defaults to this URL too.) > > What I have been unable to do is get an explicit repo URL in a pull or > push command to work. Every spelling I try either silently and > immediately returns a prompt, with no evidence anything happened, or > gives a error message criticizing the repo URL as if it were supposed > to be a branch name or something other than a URL.. > > > And who handles them? > > Or it is automatic? But how to stop arbitrary edits then? > > I am quite certain it is not automatic. You have to explicitly pull. > > Somebody else with their own local repo can push it to yours, but you > have to have given them permission somehow. I doubt the github repo > will ever get pushed to yours. You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': http://git-scm.com/docs/git-pull I'm not sure if the small number of m3 developers will need pull requests for their collaboration. Olaf -- Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 From jay.krell at cornell.edu Thu Dec 11 06:00:17 2014 From: jay.krell at cornell.edu (Jay K) Date: Thu, 11 Dec 2014 05:00:17 +0000 Subject: [M3devel] getting started with git? In-Reply-To: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> References: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> Message-ID: >> https://help.github.com/articles/using-pull-requests/ Aha, so we can please use the "shared repository model"? I'll try pushing a change later and see if I'm already allowed. I too had developed a severe case of "Stockholm syndrome" with CVS -- learning to like your captors. I could tell it was awful, but I understood it pretty well and could work within its limits. Thanks, - Jay > From: rcolebur at SCIRES.COM > To: m3devel at elegosoft.com > Date: Thu, 11 Dec 2014 00:10:30 +0000 > Subject: Re: [M3devel] getting started with git? > > I must confess that I am totally lost at this point wrt github. > I understood what was going on with CVS and used TortoiseCVS to make it easy to keep my local repo up-to-date and submit changes to the repository. > I need to spend some time learning the new system. > Can someone point me to the "fast start" web pages so I can figure out what I need to do. > > Also, I am losing this email address before the end of the year, so I need to transition all my cm3 mail list subscriptions to a new email address. I don't want to post that address here, but if someone can tell me who to contact to make the change, I would appreciate it. > > Thanks, > Randy Coleburn > > -----Original Message----- > From: Olaf Wagner [mailto:wagner at elego.de] > Sent: Wednesday, December 10, 2014 12:13 PM > To: rodney.m.bates at acm.org > Cc: m3devel at elegosoft.com > Subject: EXT:Re: [M3devel] getting started with git? > > On Wed, 10 Dec 2014 08:29:29 -0600 > "Rodney M. Bates" wrote: > > > I'm pretty new at git too, so my impressions are tenuous > > > > On 12/10/2014 06:20 AM, Jay K wrote: > [...] > > > I submit a pull request? > > > I haven't figured out how. > > > > 'pull' is a git command you can issue locally, naming the remote repo > > (and the branch) you want to pull from. With the remote repo URL > > omitted, it pulls from the one you originally cloned from. That is > > remembered somewhere locally. You can examine/edit the URL with some > > command, I think 'remote'. (push defaults to this URL too.) > > > > What I have been unable to do is get an explicit repo URL in a pull or > > push command to work. Every spelling I try either silently and > > immediately returns a prompt, with no evidence anything happened, or > > gives a error message criticizing the repo URL as if it were supposed > > to be a branch name or something other than a URL.. > > > > > And who handles them? > > > Or it is automatic? But how to stop arbitrary edits then? > > > > I am quite certain it is not automatic. You have to explicitly pull. > > > > Somebody else with their own local repo can push it to yours, but you > > have to have given them permission somehow. I doubt the github repo > > will ever get pushed to yours. > > You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ > for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': > > http://git-scm.com/docs/git-pull > > I'm not sure if the small number of m3 developers will need pull requests for their collaboration. > > Olaf > -- > Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com > Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany > phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 > Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin > Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 -------------- next part -------------- An HTML attachment was scrubbed... URL: From jay.krell at cornell.edu Wed Dec 10 13:20:33 2014 From: jay.krell at cornell.edu (Jay K) Date: Wed, 10 Dec 2014 12:20:33 +0000 Subject: [M3devel] getting started with git? Message-ID: I have been struggingly to do anything with git. Just me? Please help? I understand that everyone gets a copy of the repository, so viewing history is fast and disconnected. I understand I get to commit locally so that I can commit willy nilly and nobody will notice or mind. I understand that after I commit locally willy nilly, I can "combine" many small commits into one commit, so that when eventually my changes are shared, while the history might be hierarchical/branched, it won't be too noisy. Those are all good selling points. Now, things I don't understand. Besides my local repository, is github also hosting a fork just for me? I commit to that "somewhat willy nilly"? This seems like a somewhat redundant extra layer. And then, "third level of the hierarchy", occasionally my github repository is merged with the master? I submit a pull request? I haven't figured out how. And who handles them? Or it is automatic? But how to stop arbitrary edits then? i.e. how to approve people? There is more I don't understand. Like, in CVS and Perforce I am accustomed to multiple clients/checkouts/enlistments, for separate work, or for "buddy builds". But that shouldn't require a whole additional repository full of history. What is the analog in Git? Alternatively, can some write up the following workflows: 1. start from scratch 2. get a file edited in the mainline 3. and then undone 1. start from scratch 2. get a file added in the mainline. 3. and then edited So much documentation talks about tangential scenarios, like "git init" which I don't think is relevant. also, I find git status is quite slow. So much for offline and disconnected. Is there a mode where, like: 1) files are read only by default 2) I have to run git to make them writable 3) It will remember, quickly? I am thoroughly familiar with and happy with perforce, so explanations that attempt to compare/contract/reuse-vocabulary with it are welcome. Thanks, - Jay -------------- next part -------------- An HTML attachment was scrubbed... URL: From rodney_bates at lcwb.coop Wed Dec 10 15:29:29 2014 From: rodney_bates at lcwb.coop (Rodney M. Bates) Date: Wed, 10 Dec 2014 08:29:29 -0600 Subject: [M3devel] getting started with git? In-Reply-To: References: Message-ID: <548858C9.4060608@lcwb.coop> I'm pretty new at git too, so my impressions are tenuous On 12/10/2014 06:20 AM, Jay K wrote: > I have been struggingly to do anything with git. > Just me? > Please help? > > > I understand that everyone gets a copy of the repository, so viewing history > is fast and disconnected. > > > I understand I get to commit locally so that I can commit willy nilly and nobody > will notice or mind. > > > I understand that after I commit locally willy nilly, I can "combine" many > small commits into one commit, so that when eventually my changes are shared, > while the history might be hierarchical/branched, it won't be too noisy. > Hmm, I haven't read about anything like this. What are the commands to do it? The only thing I have done is to push to github, which puts all of my separate local commits into github, all separate there too,, not aggregated. > > Those are all good selling points. > > > Now, things I don't understand. > > > Besides my local repository, is github also hosting a fork just for me? This is not my understanding. I think github has just one repository, which periodically gets your changes added when you push to it. > > > I commit to that "somewhat willy nilly"? > This seems like a somewhat redundant extra layer. > > > And then, "third level of the hierarchy", occasionally my github > repository is merged with the master? > Perhaps you are referring to having your own branch. If you create a branch locally, then push that branch, the central repo also gets a copy of the branch, with all its history. The branch name is an operand of the 'push' command, probably defaulting to 'master' if omitted. 'master' is the name of the initial branch, and you can merge any other branch into it. This works the same within your local repo or within the guthub one. I think the right procedure would be to merge your branch into 'master', all locally, fixing any problems there. Then push your local, now-merged master to github. (And, just for backup/completeness, probably also push your branch to github too.) I think you could alternatively push your branch to github, then, in github, merge the branch into 'master' there. This would probably make the github repo temporarily difficult/impossible for others to use, if there were any merge conflicts. Seems like a bad procedure. (Or, does git precheck for conflicts and refuse to carry out the merge until they have been fixed?) After that, you'd still need to pull master from github, to get the merged changes back into your local repo. > > I submit a pull request? > I haven't figured out how. 'pull' is a git command you can issue locally, naming the remote repo (and the branch) you want to pull from. With the remote repo URL omitted, it pulls from the one you originally cloned from. That is remembered somewhere locally. You can examine/edit the URL with some command, I think 'remote'. (push defaults to this URL too.) What I have been unable to do is get an explicit repo URL in a pull or push command to work. Every spelling I try either silently and immediately returns a prompt, with no evidence anything happened, or gives a error message criticizing the repo URL as if it were supposed to be a branch name or something other than a URL.. > And who handles them? > Or it is automatic? But how to stop arbitrary edits then? I am quite certain it is not automatic. You have to explicitly pull. Somebody else with their own local repo can push it to yours, but you have to have given them permission somehow. I doubt the github repo will ever get pushed to yours. > i.e. how to approve people? > > > There is more I don't understand. > Like, in CVS and Perforce I am accustomed to multiple clients/checkouts/enlistments, > for separate work, or for "buddy builds". > > > But that shouldn't require a whole additional repository full of history. > > > What is the analog in Git? > > Alternatively, can some write up the following workflows: > > 1. start from scratch > 2. get a file edited in the mainline > 3. and then undone > > 1. start from scratch > 2. get a file added in the mainline. > 3. and then edited > > > So much documentation talks about tangential scenarios, like "git init" which I don't think is relevant. > > also, I find git status is quite slow. > So much for offline and disconnected. > Is there a mode where, like: > 1) files are read only by default > 2) I have to run git to make them writable > 3) It will remember, quickly? > > I am thoroughly familiar with and happy with perforce, so explanations > that attempt to compare/contract/reuse-vocabulary with it are welcome. > > > Thanks, > - Jay > > -- Rodney Bates rodney.m.bates at acm.org From wagner at elego.de Wed Dec 10 18:12:45 2014 From: wagner at elego.de (Olaf Wagner) Date: Wed, 10 Dec 2014 18:12:45 +0100 Subject: [M3devel] getting started with git? In-Reply-To: <548858C9.4060608@lcwb.coop> References: <548858C9.4060608@lcwb.coop> Message-ID: <20141210181245.e8b24940688af0492819c5e6@elego.de> On Wed, 10 Dec 2014 08:29:29 -0600 "Rodney M. Bates" wrote: > I'm pretty new at git too, so my impressions are tenuous > > On 12/10/2014 06:20 AM, Jay K wrote: [...] > > I submit a pull request? > > I haven't figured out how. > > 'pull' is a git command you can issue locally, naming the remote > repo (and the branch) you want to pull from. With the remote repo URL > omitted, it pulls from the one you originally cloned from. That is > remembered somewhere locally. You can examine/edit the URL with some > command, I think 'remote'. (push defaults to this URL too.) > > What I have been unable to do is get an explicit repo URL in > a pull or push command to work. Every spelling I try either silently > and immediately returns a prompt, with no evidence anything happened, > or gives a error message criticizing the repo URL as if it were supposed > to be a branch name or something other than a URL.. > > > And who handles them? > > Or it is automatic? But how to stop arbitrary edits then? > > I am quite certain it is not automatic. You have to explicitly pull. > > Somebody else with their own local repo can push it to yours, but you > have to have given them permission somehow. I doubt the github repo > will ever get pushed to yours. You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': http://git-scm.com/docs/git-pull I'm not sure if the small number of m3 developers will need pull requests for their collaboration. Olaf -- Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 From jay.krell at cornell.edu Thu Dec 11 01:08:40 2014 From: jay.krell at cornell.edu (Jay K) Date: Thu, 11 Dec 2014 00:08:40 +0000 Subject: [M3devel] getting started with git? In-Reply-To: <20141210181245.e8b24940688af0492819c5e6@elego.de> References: , <548858C9.4060608@lcwb.coop>, <20141210181245.e8b24940688af0492819c5e6@elego.de> Message-ID: I wasn't clear. I see no need for me to have my own github hosted repository. I might have "fell" into having it through. I'd just like to have the one "master" on github and an unavoidable local repo. (just one local? or a few?) I'd like to push to master. Can this work? And then, who controls who is allowed to push to master? Surely it isn't just world-writable. Or I must push to github-hosted-jaykrell and then someone/everyone must pull from github-hosted-jaykrell? Thanks, - Jay > Date: Wed, 10 Dec 2014 18:12:45 +0100 > From: wagner at elego.de > To: rodney.m.bates at acm.org > CC: m3devel at elegosoft.com > Subject: Re: [M3devel] getting started with git? > > On Wed, 10 Dec 2014 08:29:29 -0600 > "Rodney M. Bates" wrote: > > > I'm pretty new at git too, so my impressions are tenuous > > > > On 12/10/2014 06:20 AM, Jay K wrote: > [...] > > > I submit a pull request? > > > I haven't figured out how. > > > > 'pull' is a git command you can issue locally, naming the remote > > repo (and the branch) you want to pull from. With the remote repo URL > > omitted, it pulls from the one you originally cloned from. That is > > remembered somewhere locally. You can examine/edit the URL with some > > command, I think 'remote'. (push defaults to this URL too.) > > > > What I have been unable to do is get an explicit repo URL in > > a pull or push command to work. Every spelling I try either silently > > and immediately returns a prompt, with no evidence anything happened, > > or gives a error message criticizing the repo URL as if it were supposed > > to be a branch name or something other than a URL.. > > > > > And who handles them? > > > Or it is automatic? But how to stop arbitrary edits then? > > > > I am quite certain it is not automatic. You have to explicitly pull. > > > > Somebody else with their own local repo can push it to yours, but you > > have to have given them permission somehow. I doubt the github repo > > will ever get pushed to yours. > > You're talking about two different things. See > https://help.github.com/articles/using-pull-requests/ > for pull requests on github, wile 'git pull' is just > a combination of 'git fetch' and 'git merge': > > http://git-scm.com/docs/git-pull > > I'm not sure if the small number of m3 developers will need > pull requests for their collaboration. > > Olaf > -- > Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com > Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany > phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 > Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin > Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 -------------- next part -------------- An HTML attachment was scrubbed... URL: From rcolebur at SCIRES.COM Thu Dec 11 01:10:30 2014 From: rcolebur at SCIRES.COM (Coleburn, Randy) Date: Thu, 11 Dec 2014 00:10:30 +0000 Subject: [M3devel] getting started with git? Message-ID: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> I must confess that I am totally lost at this point wrt github. I understood what was going on with CVS and used TortoiseCVS to make it easy to keep my local repo up-to-date and submit changes to the repository. I need to spend some time learning the new system. Can someone point me to the "fast start" web pages so I can figure out what I need to do. Also, I am losing this email address before the end of the year, so I need to transition all my cm3 mail list subscriptions to a new email address. I don't want to post that address here, but if someone can tell me who to contact to make the change, I would appreciate it. Thanks, Randy Coleburn -----Original Message----- From: Olaf Wagner [mailto:wagner at elego.de] Sent: Wednesday, December 10, 2014 12:13 PM To: rodney.m.bates at acm.org Cc: m3devel at elegosoft.com Subject: EXT:Re: [M3devel] getting started with git? On Wed, 10 Dec 2014 08:29:29 -0600 "Rodney M. Bates" wrote: > I'm pretty new at git too, so my impressions are tenuous > > On 12/10/2014 06:20 AM, Jay K wrote: [...] > > I submit a pull request? > > I haven't figured out how. > > 'pull' is a git command you can issue locally, naming the remote repo > (and the branch) you want to pull from. With the remote repo URL > omitted, it pulls from the one you originally cloned from. That is > remembered somewhere locally. You can examine/edit the URL with some > command, I think 'remote'. (push defaults to this URL too.) > > What I have been unable to do is get an explicit repo URL in a pull or > push command to work. Every spelling I try either silently and > immediately returns a prompt, with no evidence anything happened, or > gives a error message criticizing the repo URL as if it were supposed > to be a branch name or something other than a URL.. > > > And who handles them? > > Or it is automatic? But how to stop arbitrary edits then? > > I am quite certain it is not automatic. You have to explicitly pull. > > Somebody else with their own local repo can push it to yours, but you > have to have given them permission somehow. I doubt the github repo > will ever get pushed to yours. You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': http://git-scm.com/docs/git-pull I'm not sure if the small number of m3 developers will need pull requests for their collaboration. Olaf -- Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 From jay.krell at cornell.edu Thu Dec 11 06:00:17 2014 From: jay.krell at cornell.edu (Jay K) Date: Thu, 11 Dec 2014 05:00:17 +0000 Subject: [M3devel] getting started with git? In-Reply-To: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> References: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> Message-ID: >> https://help.github.com/articles/using-pull-requests/ Aha, so we can please use the "shared repository model"? I'll try pushing a change later and see if I'm already allowed. I too had developed a severe case of "Stockholm syndrome" with CVS -- learning to like your captors. I could tell it was awful, but I understood it pretty well and could work within its limits. Thanks, - Jay > From: rcolebur at SCIRES.COM > To: m3devel at elegosoft.com > Date: Thu, 11 Dec 2014 00:10:30 +0000 > Subject: Re: [M3devel] getting started with git? > > I must confess that I am totally lost at this point wrt github. > I understood what was going on with CVS and used TortoiseCVS to make it easy to keep my local repo up-to-date and submit changes to the repository. > I need to spend some time learning the new system. > Can someone point me to the "fast start" web pages so I can figure out what I need to do. > > Also, I am losing this email address before the end of the year, so I need to transition all my cm3 mail list subscriptions to a new email address. I don't want to post that address here, but if someone can tell me who to contact to make the change, I would appreciate it. > > Thanks, > Randy Coleburn > > -----Original Message----- > From: Olaf Wagner [mailto:wagner at elego.de] > Sent: Wednesday, December 10, 2014 12:13 PM > To: rodney.m.bates at acm.org > Cc: m3devel at elegosoft.com > Subject: EXT:Re: [M3devel] getting started with git? > > On Wed, 10 Dec 2014 08:29:29 -0600 > "Rodney M. Bates" wrote: > > > I'm pretty new at git too, so my impressions are tenuous > > > > On 12/10/2014 06:20 AM, Jay K wrote: > [...] > > > I submit a pull request? > > > I haven't figured out how. > > > > 'pull' is a git command you can issue locally, naming the remote repo > > (and the branch) you want to pull from. With the remote repo URL > > omitted, it pulls from the one you originally cloned from. That is > > remembered somewhere locally. You can examine/edit the URL with some > > command, I think 'remote'. (push defaults to this URL too.) > > > > What I have been unable to do is get an explicit repo URL in a pull or > > push command to work. Every spelling I try either silently and > > immediately returns a prompt, with no evidence anything happened, or > > gives a error message criticizing the repo URL as if it were supposed > > to be a branch name or something other than a URL.. > > > > > And who handles them? > > > Or it is automatic? But how to stop arbitrary edits then? > > > > I am quite certain it is not automatic. You have to explicitly pull. > > > > Somebody else with their own local repo can push it to yours, but you > > have to have given them permission somehow. I doubt the github repo > > will ever get pushed to yours. > > You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ > for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': > > http://git-scm.com/docs/git-pull > > I'm not sure if the small number of m3 developers will need pull requests for their collaboration. > > Olaf > -- > Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com > Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany > phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 > Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin > Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 -------------- next part -------------- An HTML attachment was scrubbed... URL: From jay.krell at cornell.edu Wed Dec 10 13:20:33 2014 From: jay.krell at cornell.edu (Jay K) Date: Wed, 10 Dec 2014 12:20:33 +0000 Subject: [M3devel] getting started with git? Message-ID: I have been struggingly to do anything with git. Just me? Please help? I understand that everyone gets a copy of the repository, so viewing history is fast and disconnected. I understand I get to commit locally so that I can commit willy nilly and nobody will notice or mind. I understand that after I commit locally willy nilly, I can "combine" many small commits into one commit, so that when eventually my changes are shared, while the history might be hierarchical/branched, it won't be too noisy. Those are all good selling points. Now, things I don't understand. Besides my local repository, is github also hosting a fork just for me? I commit to that "somewhat willy nilly"? This seems like a somewhat redundant extra layer. And then, "third level of the hierarchy", occasionally my github repository is merged with the master? I submit a pull request? I haven't figured out how. And who handles them? Or it is automatic? But how to stop arbitrary edits then? i.e. how to approve people? There is more I don't understand. Like, in CVS and Perforce I am accustomed to multiple clients/checkouts/enlistments, for separate work, or for "buddy builds". But that shouldn't require a whole additional repository full of history. What is the analog in Git? Alternatively, can some write up the following workflows: 1. start from scratch 2. get a file edited in the mainline 3. and then undone 1. start from scratch 2. get a file added in the mainline. 3. and then edited So much documentation talks about tangential scenarios, like "git init" which I don't think is relevant. also, I find git status is quite slow. So much for offline and disconnected. Is there a mode where, like: 1) files are read only by default 2) I have to run git to make them writable 3) It will remember, quickly? I am thoroughly familiar with and happy with perforce, so explanations that attempt to compare/contract/reuse-vocabulary with it are welcome. Thanks, - Jay -------------- next part -------------- An HTML attachment was scrubbed... URL: From rodney_bates at lcwb.coop Wed Dec 10 15:29:29 2014 From: rodney_bates at lcwb.coop (Rodney M. Bates) Date: Wed, 10 Dec 2014 08:29:29 -0600 Subject: [M3devel] getting started with git? In-Reply-To: References: Message-ID: <548858C9.4060608@lcwb.coop> I'm pretty new at git too, so my impressions are tenuous On 12/10/2014 06:20 AM, Jay K wrote: > I have been struggingly to do anything with git. > Just me? > Please help? > > > I understand that everyone gets a copy of the repository, so viewing history > is fast and disconnected. > > > I understand I get to commit locally so that I can commit willy nilly and nobody > will notice or mind. > > > I understand that after I commit locally willy nilly, I can "combine" many > small commits into one commit, so that when eventually my changes are shared, > while the history might be hierarchical/branched, it won't be too noisy. > Hmm, I haven't read about anything like this. What are the commands to do it? The only thing I have done is to push to github, which puts all of my separate local commits into github, all separate there too,, not aggregated. > > Those are all good selling points. > > > Now, things I don't understand. > > > Besides my local repository, is github also hosting a fork just for me? This is not my understanding. I think github has just one repository, which periodically gets your changes added when you push to it. > > > I commit to that "somewhat willy nilly"? > This seems like a somewhat redundant extra layer. > > > And then, "third level of the hierarchy", occasionally my github > repository is merged with the master? > Perhaps you are referring to having your own branch. If you create a branch locally, then push that branch, the central repo also gets a copy of the branch, with all its history. The branch name is an operand of the 'push' command, probably defaulting to 'master' if omitted. 'master' is the name of the initial branch, and you can merge any other branch into it. This works the same within your local repo or within the guthub one. I think the right procedure would be to merge your branch into 'master', all locally, fixing any problems there. Then push your local, now-merged master to github. (And, just for backup/completeness, probably also push your branch to github too.) I think you could alternatively push your branch to github, then, in github, merge the branch into 'master' there. This would probably make the github repo temporarily difficult/impossible for others to use, if there were any merge conflicts. Seems like a bad procedure. (Or, does git precheck for conflicts and refuse to carry out the merge until they have been fixed?) After that, you'd still need to pull master from github, to get the merged changes back into your local repo. > > I submit a pull request? > I haven't figured out how. 'pull' is a git command you can issue locally, naming the remote repo (and the branch) you want to pull from. With the remote repo URL omitted, it pulls from the one you originally cloned from. That is remembered somewhere locally. You can examine/edit the URL with some command, I think 'remote'. (push defaults to this URL too.) What I have been unable to do is get an explicit repo URL in a pull or push command to work. Every spelling I try either silently and immediately returns a prompt, with no evidence anything happened, or gives a error message criticizing the repo URL as if it were supposed to be a branch name or something other than a URL.. > And who handles them? > Or it is automatic? But how to stop arbitrary edits then? I am quite certain it is not automatic. You have to explicitly pull. Somebody else with their own local repo can push it to yours, but you have to have given them permission somehow. I doubt the github repo will ever get pushed to yours. > i.e. how to approve people? > > > There is more I don't understand. > Like, in CVS and Perforce I am accustomed to multiple clients/checkouts/enlistments, > for separate work, or for "buddy builds". > > > But that shouldn't require a whole additional repository full of history. > > > What is the analog in Git? > > Alternatively, can some write up the following workflows: > > 1. start from scratch > 2. get a file edited in the mainline > 3. and then undone > > 1. start from scratch > 2. get a file added in the mainline. > 3. and then edited > > > So much documentation talks about tangential scenarios, like "git init" which I don't think is relevant. > > also, I find git status is quite slow. > So much for offline and disconnected. > Is there a mode where, like: > 1) files are read only by default > 2) I have to run git to make them writable > 3) It will remember, quickly? > > I am thoroughly familiar with and happy with perforce, so explanations > that attempt to compare/contract/reuse-vocabulary with it are welcome. > > > Thanks, > - Jay > > -- Rodney Bates rodney.m.bates at acm.org From wagner at elego.de Wed Dec 10 18:12:45 2014 From: wagner at elego.de (Olaf Wagner) Date: Wed, 10 Dec 2014 18:12:45 +0100 Subject: [M3devel] getting started with git? In-Reply-To: <548858C9.4060608@lcwb.coop> References: <548858C9.4060608@lcwb.coop> Message-ID: <20141210181245.e8b24940688af0492819c5e6@elego.de> On Wed, 10 Dec 2014 08:29:29 -0600 "Rodney M. Bates" wrote: > I'm pretty new at git too, so my impressions are tenuous > > On 12/10/2014 06:20 AM, Jay K wrote: [...] > > I submit a pull request? > > I haven't figured out how. > > 'pull' is a git command you can issue locally, naming the remote > repo (and the branch) you want to pull from. With the remote repo URL > omitted, it pulls from the one you originally cloned from. That is > remembered somewhere locally. You can examine/edit the URL with some > command, I think 'remote'. (push defaults to this URL too.) > > What I have been unable to do is get an explicit repo URL in > a pull or push command to work. Every spelling I try either silently > and immediately returns a prompt, with no evidence anything happened, > or gives a error message criticizing the repo URL as if it were supposed > to be a branch name or something other than a URL.. > > > And who handles them? > > Or it is automatic? But how to stop arbitrary edits then? > > I am quite certain it is not automatic. You have to explicitly pull. > > Somebody else with their own local repo can push it to yours, but you > have to have given them permission somehow. I doubt the github repo > will ever get pushed to yours. You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': http://git-scm.com/docs/git-pull I'm not sure if the small number of m3 developers will need pull requests for their collaboration. Olaf -- Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 From jay.krell at cornell.edu Thu Dec 11 01:08:40 2014 From: jay.krell at cornell.edu (Jay K) Date: Thu, 11 Dec 2014 00:08:40 +0000 Subject: [M3devel] getting started with git? In-Reply-To: <20141210181245.e8b24940688af0492819c5e6@elego.de> References: , <548858C9.4060608@lcwb.coop>, <20141210181245.e8b24940688af0492819c5e6@elego.de> Message-ID: I wasn't clear. I see no need for me to have my own github hosted repository. I might have "fell" into having it through. I'd just like to have the one "master" on github and an unavoidable local repo. (just one local? or a few?) I'd like to push to master. Can this work? And then, who controls who is allowed to push to master? Surely it isn't just world-writable. Or I must push to github-hosted-jaykrell and then someone/everyone must pull from github-hosted-jaykrell? Thanks, - Jay > Date: Wed, 10 Dec 2014 18:12:45 +0100 > From: wagner at elego.de > To: rodney.m.bates at acm.org > CC: m3devel at elegosoft.com > Subject: Re: [M3devel] getting started with git? > > On Wed, 10 Dec 2014 08:29:29 -0600 > "Rodney M. Bates" wrote: > > > I'm pretty new at git too, so my impressions are tenuous > > > > On 12/10/2014 06:20 AM, Jay K wrote: > [...] > > > I submit a pull request? > > > I haven't figured out how. > > > > 'pull' is a git command you can issue locally, naming the remote > > repo (and the branch) you want to pull from. With the remote repo URL > > omitted, it pulls from the one you originally cloned from. That is > > remembered somewhere locally. You can examine/edit the URL with some > > command, I think 'remote'. (push defaults to this URL too.) > > > > What I have been unable to do is get an explicit repo URL in > > a pull or push command to work. Every spelling I try either silently > > and immediately returns a prompt, with no evidence anything happened, > > or gives a error message criticizing the repo URL as if it were supposed > > to be a branch name or something other than a URL.. > > > > > And who handles them? > > > Or it is automatic? But how to stop arbitrary edits then? > > > > I am quite certain it is not automatic. You have to explicitly pull. > > > > Somebody else with their own local repo can push it to yours, but you > > have to have given them permission somehow. I doubt the github repo > > will ever get pushed to yours. > > You're talking about two different things. See > https://help.github.com/articles/using-pull-requests/ > for pull requests on github, wile 'git pull' is just > a combination of 'git fetch' and 'git merge': > > http://git-scm.com/docs/git-pull > > I'm not sure if the small number of m3 developers will need > pull requests for their collaboration. > > Olaf > -- > Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com > Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany > phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 > Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin > Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 -------------- next part -------------- An HTML attachment was scrubbed... URL: From rcolebur at SCIRES.COM Thu Dec 11 01:10:30 2014 From: rcolebur at SCIRES.COM (Coleburn, Randy) Date: Thu, 11 Dec 2014 00:10:30 +0000 Subject: [M3devel] getting started with git? Message-ID: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> I must confess that I am totally lost at this point wrt github. I understood what was going on with CVS and used TortoiseCVS to make it easy to keep my local repo up-to-date and submit changes to the repository. I need to spend some time learning the new system. Can someone point me to the "fast start" web pages so I can figure out what I need to do. Also, I am losing this email address before the end of the year, so I need to transition all my cm3 mail list subscriptions to a new email address. I don't want to post that address here, but if someone can tell me who to contact to make the change, I would appreciate it. Thanks, Randy Coleburn -----Original Message----- From: Olaf Wagner [mailto:wagner at elego.de] Sent: Wednesday, December 10, 2014 12:13 PM To: rodney.m.bates at acm.org Cc: m3devel at elegosoft.com Subject: EXT:Re: [M3devel] getting started with git? On Wed, 10 Dec 2014 08:29:29 -0600 "Rodney M. Bates" wrote: > I'm pretty new at git too, so my impressions are tenuous > > On 12/10/2014 06:20 AM, Jay K wrote: [...] > > I submit a pull request? > > I haven't figured out how. > > 'pull' is a git command you can issue locally, naming the remote repo > (and the branch) you want to pull from. With the remote repo URL > omitted, it pulls from the one you originally cloned from. That is > remembered somewhere locally. You can examine/edit the URL with some > command, I think 'remote'. (push defaults to this URL too.) > > What I have been unable to do is get an explicit repo URL in a pull or > push command to work. Every spelling I try either silently and > immediately returns a prompt, with no evidence anything happened, or > gives a error message criticizing the repo URL as if it were supposed > to be a branch name or something other than a URL.. > > > And who handles them? > > Or it is automatic? But how to stop arbitrary edits then? > > I am quite certain it is not automatic. You have to explicitly pull. > > Somebody else with their own local repo can push it to yours, but you > have to have given them permission somehow. I doubt the github repo > will ever get pushed to yours. You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': http://git-scm.com/docs/git-pull I'm not sure if the small number of m3 developers will need pull requests for their collaboration. Olaf -- Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 From jay.krell at cornell.edu Thu Dec 11 06:00:17 2014 From: jay.krell at cornell.edu (Jay K) Date: Thu, 11 Dec 2014 05:00:17 +0000 Subject: [M3devel] getting started with git? In-Reply-To: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> References: <0BB8FA59C2932741A3A2941A8B9D8BFF94752B42@ATLEX04-SRV.SCIRES.LOCAL> Message-ID: >> https://help.github.com/articles/using-pull-requests/ Aha, so we can please use the "shared repository model"? I'll try pushing a change later and see if I'm already allowed. I too had developed a severe case of "Stockholm syndrome" with CVS -- learning to like your captors. I could tell it was awful, but I understood it pretty well and could work within its limits. Thanks, - Jay > From: rcolebur at SCIRES.COM > To: m3devel at elegosoft.com > Date: Thu, 11 Dec 2014 00:10:30 +0000 > Subject: Re: [M3devel] getting started with git? > > I must confess that I am totally lost at this point wrt github. > I understood what was going on with CVS and used TortoiseCVS to make it easy to keep my local repo up-to-date and submit changes to the repository. > I need to spend some time learning the new system. > Can someone point me to the "fast start" web pages so I can figure out what I need to do. > > Also, I am losing this email address before the end of the year, so I need to transition all my cm3 mail list subscriptions to a new email address. I don't want to post that address here, but if someone can tell me who to contact to make the change, I would appreciate it. > > Thanks, > Randy Coleburn > > -----Original Message----- > From: Olaf Wagner [mailto:wagner at elego.de] > Sent: Wednesday, December 10, 2014 12:13 PM > To: rodney.m.bates at acm.org > Cc: m3devel at elegosoft.com > Subject: EXT:Re: [M3devel] getting started with git? > > On Wed, 10 Dec 2014 08:29:29 -0600 > "Rodney M. Bates" wrote: > > > I'm pretty new at git too, so my impressions are tenuous > > > > On 12/10/2014 06:20 AM, Jay K wrote: > [...] > > > I submit a pull request? > > > I haven't figured out how. > > > > 'pull' is a git command you can issue locally, naming the remote repo > > (and the branch) you want to pull from. With the remote repo URL > > omitted, it pulls from the one you originally cloned from. That is > > remembered somewhere locally. You can examine/edit the URL with some > > command, I think 'remote'. (push defaults to this URL too.) > > > > What I have been unable to do is get an explicit repo URL in a pull or > > push command to work. Every spelling I try either silently and > > immediately returns a prompt, with no evidence anything happened, or > > gives a error message criticizing the repo URL as if it were supposed > > to be a branch name or something other than a URL.. > > > > > And who handles them? > > > Or it is automatic? But how to stop arbitrary edits then? > > > > I am quite certain it is not automatic. You have to explicitly pull. > > > > Somebody else with their own local repo can push it to yours, but you > > have to have given them permission somehow. I doubt the github repo > > will ever get pushed to yours. > > You're talking about two different things. See https://help.github.com/articles/using-pull-requests/ > for pull requests on github, wile 'git pull' is just a combination of 'git fetch' and 'git merge': > > http://git-scm.com/docs/git-pull > > I'm not sure if the small number of m3 developers will need pull requests for their collaboration. > > Olaf > -- > Olaf Wagner -- elego Software Solutions GmbH -- http://www.elegosoft.com > Gustav-Meyer-Allee 25 / Geb?ude 12, 13355 Berlin, Germany > phone: +49 30 23 45 86 96 mobile: +49 177 2345 869 fax: +49 30 23 45 86 95 > Gesch?ftsf?hrer: Olaf Wagner | Sitz: Berlin > Handelregister: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194 -------------- next part -------------- An HTML attachment was scrubbed... URL: