Re: [git-users] Replacing upstream changes with my local and proper fix
On Mon, Jun 7, 2010 at 14:23, Trans transf...@gmail.com wrote: Hi-- I am working on a project with another developer. He was having some issues getting things working so he made some changes and pushed them up to the master repo. However, his changes were the wrong way to go about it. If only a couple of lines were affected I would just pull it down and go from there, but the changes touched almost every file --so merging the real fix, which I've already have done in my local repo, will certainly cause a whole bunch of conflicts. What's the best way to go about dropping the latest upstream changes and replacing them with my own? Thanks. You're probably best off reverting the commit(s) that brought in the changes you don't want, before merging in your changes. Your merge will then be able to go forward as though the other changes had never happened. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Small mystery
On Wed, Apr 7, 2010 at 11:54, Pito Salas r...@salas.com wrote: I thought I understood this but here's a puzzle for me: 1) Download jquery branch locally: $ git fetch origin jquery From github.com:trustthevote/ElectionManager * branch jquery - FETCH_HEAD Looks like it worked, right? 2) List all branches. Where is it? $ git branch -a converterimport develop domain_tables jurist_list master txballot * web-theme remotes/origin/HEAD - origin/master remotes/origin/converterimport remotes/origin/cucumber remotes/origin/develop remotes/origin/domain_tables remotes/origin/idents remotes/origin/master remotes/origin/mimic_nh_ballots remotes/origin/railroad remotes/origin/refactorrender remotes/origin/release-001 remotes/origin/singleballotimp remotes/origin/tgd_dev remotes/origin/txballot remotes/origin/web-theme remotes/origin/wicked_pdf remotes/origin/yaml_batch_import remotes/origin/ymlsupport Anyone see what's messing me up? Probably something stupid... Thanks! Pito The problem is that git fetch doesn't _create_ branches. When you downloaded the branch with git fetch origin jquery, it stored the ref locally as FETCH_HEAD (cat .git/FETCH_HEAD if you want to see the details). If you want to create a local branch based off of the remote jquery branch, you can git fetch git checkout -b jquery origin/jquery. The git fetch in this case is simply update all of my references to the origin repo, and git checkout -b jquery origin/jquery will create a local jquery branch based off of the origin/jquery reference. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] Git submodules download every time with git cap deploy?
On 11:42 Tue 09 Feb , rubybox wrote: First adding all submodules git add submodule git://bla /bla git add . git commit -m 'adding my submodules' When I run cap deploy It downloads my git submodules every time from the remote repos, Is this standard behaviour? I wished it just would look for changes and, if exists, updated the remote code Is this possible? Could not find a solution but new to ror, git so must choose the wrong words You're best off asking this on the Capistrano mailing list: http://groups.google.com/group/capistrano capistr...@googlegroups.com -- Jacob Helwig -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
Re: [git-users] User Restrictions....
On Thu, Jan 21, 2010 at 11:23, Jeffda daniel.viviot...@gmail.com wrote: Is it possible to allow commit, or patch apply, permissions for a user, but only if they aren't the ones that made the modification? For instance, if someone submits a patch to the user, the user will be able to apply the patch; however, if the user creates a patch, the user shouldn't have the ability to apply the patch. Is this possible with GIT? You could have some hooks setup on a central repository to check that the author and committer are always different, and reject the push, if they're not. However, there is nothing to prevent the user from lying about the author committer name/email/date information, when they make the commit. -Jacob -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
