Re: [git-users] Branch level authentication

2013-08-16 Thread Gergely Polonkai
Hello,

git itself is not capable of authentication and authorization, you will
need a separate software for that. I personally use gitosis, but many
others exist out there. This kind of software is needed only on the
server side, clients can still use good old git client.

Best,
Gergely
On 16 Aug 2013 06:46, Jimit Modi jimy2004k...@gmail.com wrote:

 At our company, we are evaulating to migrate to GIT from SVN. Here we are
 following a process in which we have the following branch and access
 control.

 ---
 | Branch| Purpose  | ACL  |
 ---
 | `master`  | live copy| AGM  |
 ---
 | `staging` | staging copy | AGM, TL  |
 ---
 | 'dev` | development copy | AGM, TL, Devs|
 ---

 Now all devs create a feature branch from the dev branch and again merge
 it in dev when they have finished working and push it. Now TL review the
 work and cherry pick or merge dev in staging, depending on the sencario.
 If everything is well they push the changes on staging. Same is done by
 AGM's for master branch.
 We want that devs will be able to pull the changes from staging and master 
 branch,
 but will not be able to push.

 So the question is:
 - How can we setup a authentication system where only the allowed one will
 be able to push.?

 --
 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/groups/opt_out.


-- 
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/groups/opt_out.


[git-users] Git's use of less

2013-08-16 Thread Dale R. Worley
After using git diff, I believe that Git (1.7.7.6) uses less by
default if there is no explicit pager specification (via $PAGER or
Git's core.pager).

1) Am I correct?

2) I dislike defaulting to using a pager (partly because I dislike
less in particular).

3) In any case, using a pager by default doesn't seem to be
documented, either on the main git manual page or in git-config.

Dale

-- 
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/groups/opt_out.


[git-users] git diff errors

2013-08-16 Thread Dale R. Worley
Using Git (1.7.7.6), it appears that if I run git diff in a
directory that is not part of a Git working copy, it produces this
error message:

$ git diff
usage: git diff [--no-index] path path
$ 

1) This message doesn't tell the user what went wrong.  (Indeed,
invoking git diff with no arguments is valid in a working copy.)

2) The usage message is incorrect, in that the manual page lists four
fundamental invocation formats:

   git diff [options] [commit] [--] [path...]
   git diff [options] --cached [commit] [--] [path...]
   git diff [options] commit commit [--] [path...]
   git diff [options] [--no-index] [--] path path

Am I correct here?

Dale

-- 
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/groups/opt_out.


Re: [git-users] Branch level authentication

2013-08-16 Thread Jimit Modi
Thanks. Will look at it and update.

--
Jim(y || it)




On Fri, Aug 16, 2013 at 1:10 PM, Gergely Polonkai gerg...@polonkai.euwrote:

 Hello,

 git itself is not capable of authentication and authorization, you will
 need a separate software for that. I personally use gitosis, but many
 others exist out there. This kind of software is needed only on the
 server side, clients can still use good old git client.

 Best,
 Gergely
 On 16 Aug 2013 06:46, Jimit Modi jimy2004k...@gmail.com wrote:

 At our company, we are evaulating to migrate to GIT from SVN. Here we
 are following a process in which we have the following branch and access
 control.

 ---
 | Branch| Purpose  | ACL  |
 ---
 | `master`  | live copy| AGM  |
 ---
 | `staging` | staging copy | AGM, TL  |
 ---
 | 'dev` | development copy | AGM, TL, Devs|
 ---

 Now all devs create a feature branch from the dev branch and again merge
 it in dev when they have finished working and push it. Now TL review the
 work and cherry pick or merge dev in staging, depending on the sencario.
 If everything is well they push the changes on staging. Same is done by
 AGM's for master branch.
 We want that devs will be able to pull the changes from staging and
 master branch, but will not be able to push.

 So the question is:
 - How can we setup a authentication system where only the allowed one
 will be able to push.?

 --
 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/groups/opt_out.

  --
 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/groups/opt_out.


-- 
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/groups/opt_out.


Re: [git-users] Re: Merging two repositories with history and tags/branches

2013-08-16 Thread Sam Roberts
On Fri, Aug 9, 2013 at 12:04 AM, Thomas Ferris Nicolaisen
tfn...@gmail.com wrote:

 What I would like to know is:

 Is this at all possible?
 If so, can someone point me in the right direction?

git replace:

http://stackoverflow.com/questions/6800692/how-do-git-grafts-and-replace-differ-are-grafts-now-deprecated

Decent description is at http://progit.org/2010/03/17/replace.html,
though most of the post is actually about how to split histories apart
and manipulate them, useful in itself.

Maybe useful, too:
http://newartisans.com/2008/04/diving-into-git/#unique-entry-id-65

-- 
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/groups/opt_out.