Re: [git-users] Offering bounty: Help me use git5 to keep GitHub / Piper in sync
On Fri, May 08, 2015 at 06:26:14PM -0700, John Mulhausen wrote: Hi git folk, I will award a peer bonus to anyone who shows me how to solve this scenario with specific commands. I'd like to open source a site that has a piper-dependency for it's publishing. There are two nodes in the system: 1. GitHub.com -- where users can submit changes to us 2. Piper -- the source of truth. Changes come from GitHub dirty (not Googler-reviewed) and are merged into Piper (presumably via git5) on a per-change basis, giving us a chance to review what's coming in on either Gerrit or Critique. What's piper? What's git5? /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus I have steadily endeavored to keep my mind free, so as to give up any hypothesis, however much beloved -- and I cannot resist forming one on every subject -- as soon as facts are shown to be opposed to it. -- Charles Darwin (1809-1882) -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. pgpS5f0V1WBya.pgp Description: PGP signature
[git-users] Re: Testing a file with lots of change chunks, one chunk at a time
On 2015-05-09, at 2:59 PM, Michael keybou...@gmail.com wrote: So here's something that I'd like to do, and I'm wondering if Git is the right tool for this. I have a program's config file, that is broken up into a large number of sections. One of them is causing a problem. All of them have been modified. ... What comes to mind as a good way to do this: 1. Commit the version that has too many (including the problem section) edits made to it, to one branch. 2. Start a new branch (off the parent, not that over-edited commit), and start that with a plain config file. 3. Repeat loop: a. Check out a copy from the branch in #1. b. Commit one chunk into the branch in #2. c. Reset the file to the version just checked in d. Test 4. As long as that works, each loop will test, and commit, one more section of edits. The problem? I don't have any idea how to check out a copy of file X from branch OverEdit into branch Testing. Is there a better way to do this with git? Is git the wrong tool? Ok, I think I have a way to do this. I now want to know, is this the best way, is there a better way, are there hidden gotchas with this? git checkout -b Chest # Start with a new branch git add chest_content.cfg # Put the base, unaltered config file in git commit -m base config file # and save it git checkout -b broken-all# Now, another branch for the broken set of changes cp ../Loot/chest_content.cfg .# Put the broken file in place git commit . # Save the broken file into git git checkout Chest# Back to the working branch git checkout broken-all chest_content.cfg# Get the broken file with everything # This is the command I did not know how to do # Warning: it starts with the whole file in index git gui # Visually commit the lines for one segment at a time # First uncommit the whole file, then add just one segment git checkout -- chest_content.cfg # and throw away the other changes ## test test test # See if it works or breaks Repeat those last 4 lines until it breaks; then, back out one commit. --- Entertaining minecraft videos http://YouTube.com/keybounce --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] Testing a file with lots of change chunks, one chunk at a time
So here's something that I'd like to do, and I'm wondering if Git is the right tool for this. I have a program's config file, that is broken up into a large number of sections. One of them is causing a problem. All of them have been modified. The easiest way that I can think of to find which one is broken is to use tools like git gui to select individual chunks, commit those, and then use that new commit. But I don't know any way to use git to switch between This is the version that was checked in, and this is the version that has all the changes that need to be reviewed, probably all but one are wanted. And then commit from the version with too many changes into the changes are reviewed branch. What comes to mind as a good way to do this: 1. Commit the version that has too many (including the problem section) edits made to it, to one branch. 2. Start a new branch (off the parent, not that over-edited commit), and start that with a plain config file. 3. Repeat loop: a. Check out a copy from the branch in #1. b. Commit one chunk into the branch in #2. c. Reset the file to the version just checked in d. Test 4. As long as that works, each loop will test, and commit, one more section of edits. The problem? I don't have any idea how to check out a copy of file X from branch OverEdit into branch Testing. Is there a better way to do this with git? Is git the wrong tool? --- Entertaining minecraft videos http://YouTube.com/keybounce -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] newbie downloading git
Hi, I'm just getting started with github and git. I have tried to download git several times from the git-smc site, source forge and mirror sites. I install it and it says install successful, but then it is nowhere to be found. When I try to configure in Terminal it gives me an illegal instruction so it seems like it is not really installed, despite the installer copying files and saying the install is successful. Am I doing something wrong? Can you install git on OS 10.6.8? I don't get any error messages so I don't even know where it is failing. Advice would be greatly appreciated. Thanks, Tricia -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
