Re: [git-users] User Restrictions....

2010-01-21 Thread Jacob Helwig
On Thu, Jan 21, 2010 at 11:23, Jeffda 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

Re: [git-users] Git submodules download every time with git cap deploy?

2010-02-09 Thread Jacob Helwig
r 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...@goo

Re: [git-users] git on windows 7

2010-03-02 Thread Jacob Helwig
On Tue, Mar 2, 2010 at 07:41, msoulier wrote: > I'm stuck with this win7 crap box at the moment, and I'm wondering if > anyone is successfully running git on it. > > I just had a showstopper in cygwin, unexpected eof in my clones. I'm > looking at msysgit but I just read about a .dll issue. > > An

Re: [git-users] git on windows 7

2010-03-07 Thread Jacob Helwig
On Wed, Mar 3, 2010 at 11:27, Michael P. Soulier wrote: > On 02/03/10 Jacob Helwig said: > >> I just pulled down, and installed the latest msysgit with git-cheeta >> on my Win7 box, without any problems.  Perhaps if you mentioned what >> this mysterious ".dll issu

Re: [git-users] Meaning of 'HEAD' vs. branch master

2010-03-22 Thread Jacob Helwig
On Mon, Mar 22, 2010 at 07:22, Pito Salas wrote: > Dilip > > Thanks, that clears up a lot. > >> >> - Note this difference: a **head** (lowercase) refers to any one of the >>  *named* heads (master, stable, dust) in the repository; **HEAD** (uppercase) >>  refers exclusively to the currently *activ

Re: [git-users] Meaning of 'HEAD' vs. branch master

2010-03-22 Thread Jacob Helwig
Exactly. On Mon, Mar 22, 2010 at 08:26, Pito Salas wrote: > So, there's one HEAD per repository, not one per branch, correct? > > -- Pito > > On Mon, Mar 22, 2010 at 10:44 AM, Jacob Helwig wrote: >> On Mon, Mar 22, 2010 at 07:22, Pito Salas wrote: >>> Dilip &

Re: [git-users] Small mystery

2010-04-07 Thread Jacob Helwig
On Wed, Apr 7, 2010 at 11:54, Pito Salas 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?

Re: [git-users] Replacing upstream changes with my local and proper fix

2010-06-07 Thread Jacob Helwig
On Mon, Jun 7, 2010 at 14:23, Trans 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

Re: [git-users] Re: Replacing upstream changes with my local and proper fix

2010-06-07 Thread Jacob Helwig
On Mon, Jun 7, 2010 at 14:48, Trans wrote: > > On Jun 7, 5:31 pm, Jacob Helwig wrote: > >> 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 g