[git-users] using pki certificates with git and a https server on RHEL 6.x

2014-05-13 Thread Matthew Polder
I'm trying to use git to connect to a https server that requires PKI certificates for authentication. I'm running git on RHEL 6.x, so it is using the NSS libraries (I believe). I've used the pk12util tool to import my certificates: pk12util -i myCertificate.p12 -d sql:/home/myusername/.ssl -n

[git-users] directory vs repository

2014-05-13 Thread Alain
Hi, i'm learning how to setup/use Git. So in other words, i'm reading a book about Git (http://www.amazon.com/Git-Version-everyone-Ravishankar-Somasundaram/dp/1849517525/ref=sr_1_5?ie=UTF8&qid=1399986673&sr=8-5&keywords=git). i'm almost on half of the book and for now everything is very clear,

Re: [git-users] What is the best way to visualize branch history line?

2014-05-13 Thread Dale R. Worley
> From: Leonardo Petry > > What would be the best command to view a branch history? "git log --graph" helps my intuition. 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 f

[git-users] git rewrite history for multi module project

2014-05-13 Thread Moataz Elmasry
Hello list We had in our svn repo, the following structure: svn |_Project1 |_subproject1 |_branches |_branch1 |_branch2 |_trunk |_tags |_tagv1 |_Non-JavaProject

Re: [git-users] using pki certificates with git and a https server on RHEL 6.x

2014-05-13 Thread Konstantin Khomoutov
On Tue, 13 May 2014 06:32:28 -0700 (PDT) Matthew Polder wrote: > I'm trying to use git to connect to a https server that requires PKI > certificates for authentication. I'm running git on RHEL 6.x, so it > is using the NSS libraries (I believe). [...] > When I attempt to clone the git repo on t

Re: [git-users] What is the best way to visualize branch history line?

2014-05-13 Thread Konstantin Khomoutov
On Tue, 13 May 2014 09:47:40 -0400 wor...@alum.mit.edu (Dale R. Worley) wrote: > > What would be the best command to view a branch history? > > "git log --graph" helps my intuition. Agreed. I have `git overview` alias set to git log --graph --all --decorate --oneline to get an overview of "

Re: [git-users] What is the best way to visualize branch history line?

2014-05-13 Thread Felipe Contreras
On Tue, May 13, 2014 at 9:19 AM, Konstantin Khomoutov wrote: > On Tue, 13 May 2014 09:47:40 -0400 > wor...@alum.mit.edu (Dale R. Worley) wrote: > >> > What would be the best command to view a branch history? >> >> "git log --graph" helps my intuition. > > Agreed. I have `git overview` alias set t

Re: [git-users] directory vs repository

2014-05-13 Thread Konstantin Khomoutov
On Tue, 13 May 2014 06:39:51 -0700 (PDT) Alain wrote: > i'm learning how to setup/use Git. So in other words, i'm reading a > book about Git [...] > e.g. on my laptop i have a GIT repository as following: > C:\repositories\git\ > > so in this folder/directory i have the following things: > C:\r

[git-users] That's really weird, there is no issue tracking for git, I want to report a bug, git can not check-out files with invalid Windows path.

2014-05-13 Thread Yonggang Luo
error: unable to create file test/API/pthread-RPP|TPP.SUSv4.syms (Invalid argument) error: unable to create file test/API/sched-PS|TPS.SUSv4.syms (Invalid argument) error: unable to create file test/API/sys_mman-XSI|SIO.SUSv4.syms (Invalid argument) for example, in this path, it's contains |.

Re: [git-users] That's really weird, there is no issue tracking for git, I want to report a bug, git can not check-out files with invalid Windows path.

2014-05-13 Thread Konstantin Khomoutov
On Tue, 13 May 2014 09:08:57 -0700 (PDT) Yonggang Luo wrote: > error: unable to create file test/API/pthread-RPP|TPP.SUSv4.syms > (Invalid argument) > error: unable to create file test/API/sched-PS|TPS.SUSv4.syms > (Invalid argument) > error: unable to create file test/API/sys_mman-XSI|SIO.SUSv4.

Re: [git-users] directory vs repository

2014-05-13 Thread Alain
> (Bare repositories, which usually exist only for storage/rendez-vouz > purposes -- as opposed to development -- do not have the work tree and > contain what the ".git" subdirectory or a normal repository contains.) > i not sure at 100% what do you mean by "rendez-vous folders", but in VSS

Re: [git-users] directory vs repository

2014-05-13 Thread Konstantin Khomoutov
On Tue, 13 May 2014 10:42:37 -0700 (PDT) Alain wrote: > > (Bare repositories, which usually exist only for > > storage/rendez-vouz purposes -- as opposed to development -- do not > > have the work tree and contain what the ".git" subdirectory or a > > normal repository contains.) > i not sure at

Re: [git-users] directory vs repository

2014-05-13 Thread Alain
On Tuesday, May 13, 2014 8:29:21 PM UTC+2, Konstantin Khomoutov wrote: > > On Tue, 13 May 2014 10:42:37 -0700 (PDT) > Alain > wrote: > > > > (Bare repositories, which usually exist only for > > > storage/rendez-vouz purposes -- as opposed to development -- do not > > > have the work tree and

[git-users] Re: git rewrite history for multi module project

2014-05-13 Thread Thomas Ferris Nicolaisen
On Tuesday, May 13, 2014 4:16:14 PM UTC+2, Moataz Elmasry wrote: > > Is it possible to build this relation, for example using git branch-filter > --tree-filter? lets say the last commit in svn/project1/subproject1 is x, > while this project was moved under > svn/mainproject/trunk/project1/subpr

Re: [git-users] What is the best way to visualize branch history line?

2014-05-13 Thread Leonardo Petry
I tried gitk today and got blown away that I completely missed this. It helps me understand the current state of my local branch in a way I couldn't before. Many Thanks. On Monday, May 12, 2014 10:57:06 PM UTC-4, charlesmanning wrote: > > I like gitk. > > > On Tue, May 13, 2014 at 2:20 PM, Leona

Re: [git-users] What is the best way to visualize branch history line?

2014-05-13 Thread Leonardo Petry
Would git log print something like this: http://denisonluz.com/blog/wp-content/uploads/terminal-pimped-lg.jpg On Tuesday, May 13, 2014 10:19:44 AM UTC-4, Konstantin Khomoutov wrote: > > On Tue, 13 May 2014 09:47:40 -0400 > wor...@alum.mit.edu (Dale R. Worley) wrote: > > > > What would be the

Re: [git-users] What is the best way to visualize branch history line?

2014-05-13 Thread Thomas Ferris Nicolaisen
On Tuesday, May 13, 2014 11:27:18 PM UTC+2, Leonardo Petry wrote: > > Would git log print something like this: > > http://denisonluz.com/blog/wp-content/uploads/terminal-pimped-lg.jpg > > Yeah, that looks like this one: On Tuesday, May 13, 2014 10:19:44 AM UTC-4, Konstantin Khomoutov wrote: >> >>

[git-users] ignore a file without listing it in .gitignore (only locally)

2014-05-13 Thread Leonardo Petry
In the project I am working on there is a config file with some DB users and password. I want this file not to be tracked in my local machine, but if there are updates to it, I want to receive those updates from the remote. Here is how I do it now: $ git add # *all changed files except the con

Re: [git-users] strange issue related to rebase.

2014-05-13 Thread Felipe Contreras
On Mon, May 12, 2014 at 10:50 PM, Felipe Contreras wrote: > I've been thinking about this and I think it's the wrong thing to do. > I'll disable this "feature" by default in my fork (git-fc). Here it is: https://github.com/felipec/git/commit/0e59c7f2eef2e675098b4412ff0f65f0023126e8 -- Felipe C

Re: [git-users] Re: git rewrite history for multi module project

2014-05-13 Thread Moataz Elmasry
Hi Thomas and thanks for your reply Why should I slice the main project? it is good the way it is. I need to append to it from the back ,i.e. earlier commits and the final state should be the main project including the commits from the time it was multiple modules/multiple trunks On Tue, May 13,

Re: [git-users] Re: git rewrite history for multi module project

2014-05-13 Thread Moataz Elmasry
In other words, I want to say assuming mainproject and subproject1 are both git repos, then for path mainproject/project1/subproject please append from the back all commits from subproject1 Another idea, what if I fetched the two origins, then rebased mainproject on subproject1, then merged from s

Re: [git-users] That's really weird, there is no issue tracking for git, I want to report a bug, git can not check-out files with invalid Windows path.

2014-05-13 Thread Thomas Ferris Nicolaisen
On Tuesday, May 13, 2014 6:27:32 PM UTC+2, Konstantin Khomoutov wrote: > > > And while we're on it, Thomas could you please update your wonderful > gist with this additional pointers regarding GfW bug tracking? > > 1. > http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247#naming_conv

Re: [git-users] Re: git rewrite history for multi module project

2014-05-13 Thread Thomas Ferris Nicolaisen
On Wednesday, May 14, 2014 7:27:53 AM UTC+2, Moataz Elmasry wrote: > > Hi Thomas and thanks for your reply > > Why should I slice the main project? it is good the way it is. I need to > append to it from the back ,i.e. earlier commits and the final state should > be the main project including t

[git-users] Re: ignore a file without listing it in .gitignore (only locally)

2014-05-13 Thread Алексей Яблоков
Local config files with Git is a big uncomfortable thing :( There is overview article about solutions: https://gist.github.com/canton7/1423106 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop rece

[git-users] Re: What is the best way to visualize branch history line?

2014-05-13 Thread Алексей Яблоков
For command line I use good alias "git hist". Add the alias: #Linux git config --global alias.hist 'log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short'#Windows git config --global alias.hist "log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short" Output example: * d6b52e

Re: [git-users] What is the best way to visualize branch history line?

2014-05-13 Thread Charles Manning
gitk has some useful options, so make sure you read the man pages. Of most interest is gitk --all That is really handy for seeing the branches relative to eachother. On Wed, May 14, 2014 at 9:23 AM, Leonardo Petry wrote: > I tried gitk today and got blown away that I completely missed this.