Re: [git-users] New user gets lost driving the Git Bash

2012-07-24 Thread Łukasz Siwiński
PS: The command like provided with Git for Windows is something like Bash for Linux. -- 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-users@googlegroups.com. To unsubscribe from this group, send

Re: [git-users] New user gets lost driving the Git Bash

2012-07-24 Thread Konstantin Khomoutov
On Mon, Jul 23, 2012 at 04:13:50PM -0700, Jeffery Brewer wrote: Aha! Figured out that after installing on windows you don't go to a command line directly, you have to go through Start All Programs Git Git Bash which gives you a different kind of command line. [...] Note that you don't

Re: [git-users] git bugs reporting

2012-07-24 Thread Thomas Ferris Nicolaisen
On Tuesday, July 24, 2012 10:10:42 AM UTC+2, Konstantin Khomoutov wrote: I have tried to send mails to git at vger.kernel.org, as indicated by the git website, but all mails bounce back. I'm not sure, but you might have to be subscribed to it. See http://vger.kernel.org/vger-lists.html

[git-users] Re: Why is this a merge conflict?

2012-07-24 Thread Antony
On Tuesday, 24 July 2012 09:36:41 UTC+1, Hans Zorn wrote: After doing a merge of 2 branches in a Delphi project I get some merge conflicts. Some I understand are clearly conflicts as they are simply adverse. But many look like this example: HEAD === + Button13: TButton;

[git-users] Re: Why is this a merge conflict?

2012-07-24 Thread Hans Zorn
Thank you for this reaction. I can follow what you write and it is clear to me that by doing what you did, the situation I described can emerge. But the thing is: there were no deletes. Head does not contain certain lines that the branch to merge in does. So the lines in the branch to merge are

Re: [git-users] how to git format patch without swith to that branch

2012-07-24 Thread lei yang
On Tue, Jul 24, 2012 at 7:53 PM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Tuesday, July 24, 2012 7:05:14 AM UTC+2, lei yang wrote: how to? If you want to format-patch for example the last two commits on branch B, this should do it: git format-patch B~2..B Yes I know this,

[git-users] Re: Bug? status --porcelain only quotes spaces in added files

2012-07-24 Thread Graham Jans
On Tuesday, 24 July 2012 04:19:49 UTC-7, Thomas Ferris Nicolaisen wrote: On Tuesday, July 24, 2012 12:29:22 AM UTC+2, Graham Jans wrote: Consider this scenario: $ touch a 1.txt $ touch a 2.txt $ git add a 1.txt $ git status --porcelain A a 1.txt ?? a 2.txt Note that the added

[git-users] Re: Bug? status --porcelain only quotes spaces in added files

2012-07-24 Thread Tim Chase
On 07/24/12 12:07, Graham Jans wrote: On Tuesday, 24 July 2012 04:37:47 UTC-7, Tim Chase wrote: $ touch a 1.txt $ touch a 2.txt $ touch 'a 3.txt' $ git add a 1.txt $ git status --porcelain A a 1.txt ?? \a 3.txt\ ?? a 2.txt

Re: [git-users] New user gets lost driving the Git Bash

2012-07-24 Thread Jeffery Brewer
Continued thanks for all the help. I'm sorry to be so slow at this...I've just done very little command line operation in the past and probably shouldn't even be allowed near computers at all. I have very little experience on Linux/Unix as well, so I'm really floundering around in the dark

Re: [git-users] how to git format patch without swith to that branch

2012-07-24 Thread Thomas Ferris Nicolaisen
On Tuesday, July 24, 2012 5:11:04 PM UTC+2, lei yang wrote: If you want to format-patch for example the last two commits on branch B, this should do it: git format-patch B~2..B Yes I know this, but I don't know how to fromat it with commit without switching to B eg:

Re: [git-users] how to git format patch without swith to that branch

2012-07-24 Thread Thomas Ferris Nicolaisen
On Tuesday, July 24, 2012 5:11:04 PM UTC+2, lei yang wrote: If you want to format-patch for example the last two commits on branch B, this should do it: git format-patch B~2..B Yes I know this, but I don't know how to fromat it with commit without switching to B eg:

[git-users] Re: Commits only from specific branch

2012-07-24 Thread Thomas Ferris Nicolaisen
BUT (there is always some), when i decide to clone Project i get newProject where is again submodule with all commits (not only master branch specific). Well, that's odd. I would think that when you clone submoduleX.git, it only brings in the commits that exist on the remote side. Can

[git-users] Re: Out of memmory, malloc failed. with large files using Gitolite on a VPS

2012-07-24 Thread Thomas Ferris Nicolaisen
On Saturday, July 21, 2012 12:20:48 AM UTC+2, EJ Etherington wrote: Greetings, I've been using git for a while but am fairly new to setting up a central shared point like gitolite. I am able to arbitrarily create small repository but have run into trouble migrating existing repositories to

Re: [git-users] New user gets lost driving the Git Bash

2012-07-24 Thread Graham Jans
On Tuesday, 24 July 2012 00:46:44 UTC-7, Konstantin Khomoutov wrote: On Mon, Jul 23, 2012 at 04:13:50PM -0700, Jeffery Brewer wrote: Aha! Figured out that after installing on windows you don't go to a command line directly, you have to go through Start All Programs Git Git Bash

Re: [git-users] Re: svn to git question

2012-07-24 Thread Gabby Romano
Hi Tomas - it appears to be working fine with grafting. thanks a lot for that. there is one issue though : seems like I have duplicate commits. these are the latest ones and not the old ones I fetched from the older repository. one part of the commits starts at remote/origin/master, and the

[git-users] First Attempt to Import from SVN Fails

2012-07-24 Thread Jeffery Brewer
Just tried a test import from SVN and ran into an error: git svn clone --stdlayout svn url returns... Can't locate Git/SVN/Editor.pm in @INC @INC contains: /lib /usr/lib/per15/5.8.8/msys /usr/lib/per15/5.8.8 /usr/lib/per15/site_perl/5.8.8/msys /usr/lig/per15/site_perl/5.8.8