Re: [git-users] git error when trying to push one commit

2013-07-10 Thread PJ Weisberg
On Jul 10, 2013 12:07 PM, "Richard Marais" wrote: ... > > Here is the list of commits, not the position of 72ba712: I've noted it. It's not a descendant of origin/master. Pushing it as origin/master would effectively discard 3a55dca. I believe what you want to do is cherry-pick 72ba712 onto a

[git-users] Re: Problem removing large files from commit

2013-07-10 Thread Matt Schoen
Hey there. Not sure if this helps you, but this guide seems to be the best authority for removing files from the repository https://help.github.com/articles/remove-sensitive-data On Wednesday, July 10, 2013 3:30:46 PM UTC-5, Larry Martell wrote: > > I accidentally committed some large files, and

[git-users] Problem removing large files from commit

2013-07-10 Thread Larry Martell
I accidentally committed some large files, and when I pushed I got: remote: Error code: b68f56c6735645b9d397abe957c294d7 remote: warning: Error GH413: Large files detected. remote: warning: See http://git.io/iEPt8g for more information. remote: error: File app/cdsem/fixtures/cdsem_event_message_id

Re: [git-users] git error when trying to push one commit

2013-07-10 Thread William Seiti Mizuta
Hi Richard, what is the return of the command git remote show origin? William Seiti Mizuta @williammizuta Caelum | Ensino e Inovação www.caelum.com.br On Wed, Jul 10, 2013 at 4:07 PM, Richard Marais wrote: > I am trying to push just one commit to origin master. However I get an > error saying

[git-users] git error when trying to push one commit

2013-07-10 Thread Richard Marais
I am trying to push just one commit to origin master. However I get an error saying I first need to fetch then merge, but I get this error after a pull. Any ideas would be appreciated. Richard@RICHARD-PC /e/Work/MH (master) $ git pull remote: Counting objects: 27, done. remote: Compressing obj

Re: [git-users] git bisect fixed/unfixed option

2013-07-10 Thread PJ Weisberg
On Jul 9, 2013 10:11 AM, "Chemsi Mehdi" wrote: > > Dear Git expert, > > I wonder how adding to git bisect fixed/unfixed options. > This in order to find a good patch fixing a bug and not to find the bad commit. > This is helpful for me. > I am working with git version 1.7.11.7 > Can you please adv

Re: [git-users] frustrations trying to control git through apache

2013-07-10 Thread Dale R. Worley
> From: tomgra...@gmail.com > : executing: cd /var/www/html/confix; echo $PATH 2>&1; > : output: /sbin:/usr/sbin:/bin:/usr/bin > > : executing: cd /var/www/html/confix; git init 2>&1; > : output: Initialized empty Git repository in /var/www/html/confix/.git/ > > : executing: cd /var/www/html/con

Re: [git-users] bash SHA-1 completion

2013-07-10 Thread Konstantin Khomoutov
On Tue, 9 Jul 2013 11:23:13 -0400 wor...@alum.mit.edu (Dale R. Worley) wrote: [...] > I suspect the reason that hash completion hasn't been done yet is more > that it isn't very useful. If you type "8d40fc" and auto-completion > offers > > 8d40fc7e56eeb9ea725054822de5c8c145a65c > 8d40fc0

[git-users] Windows 7 unable to run Git bash

2013-07-10 Thread Wee Ching Chok
I just Installed Git 1.8.3.2 My OS - Windows 7 home premium Everytime I open Git Bash. It show me the following error messages - sh.exe has stopped working. ( If this error shown the git close immediately ) - sed.exe has stopped working. - uname.exe has stopped working. Anyone having this issue?

[git-users] frustrations trying to control git through apache

2013-07-10 Thread tomgracey
Dear all, I am setting up an online documents system and have been trying to use git for the version control. That is to say, git works fine from the command line, but when I try to interface it with apache I keep getting 'bad file descriptor' and 'unable to create temporary file: No such file

Re: [git-users] Re: Truncate complete history

2013-07-10 Thread Konstantin Khomoutov
On Wed, 10 Jul 2013 02:43:04 -0700 (PDT) ironm4nc...@gmail.com wrote: > I already tried the BFG Repo Cleaner, but while running it craches > with this Exception : > org.eclipse.jgit.errors.LargeObjectException$ExceedsLimit:. > It looks like one commit is bigger than the 5 mb cache limit. Please

Re: [git-users] Re: git submodule add failed

2013-07-10 Thread Maxim Yefremov
Thanx, Thomas. This is kinda typo. And this works: *$ git submodule add g...@bitbucket.org:userName/lib2.git node_modules/lib2* On Wed, Jul 10, 2013 at 11:49 AM, Thomas Ferris Nicolaisen wrote: > On Tuesday, July 9, 2013 4:55:29 PM UTC+2, Maxim Yefremov wrote: > >> I want to add git submodule >

[git-users] Re: Truncate complete history

2013-07-10 Thread ironm4nchen
Thanks for your answer. I already tried the BFG Repo Cleaner, but while running it craches with this Exception : org.eclipse.jgit.errors.LargeObjectException$ExceedsLimit:. It looks like one commit is bigger than the 5 mb cache limit. I do have a look at the grafts / filter-branch functionalit

[git-users] Re: git bisect fixed/unfixed option

2013-07-10 Thread Thomas Ferris Nicolaisen
On Tuesday, July 9, 2013 7:11:08 PM UTC+2, Chemsi Mehdi wrote: > Dear Git expert, > > I wonder how adding to git bisect fixed/unfixed options. > This in order to find a good patch fixing a bug and not to find the bad > commit. > This is helpful for me. > I am working with git version 1.7.11.7 > C

[git-users] Re: Truncate complete history

2013-07-10 Thread Thomas Ferris Nicolaisen
On Wednesday, July 10, 2013 10:11:10 AM UTC+2, ironm...@gmail.com wrote: > Hello everyone, > > I have a repo with a size of ca 4 gb and the history is longer than 10 > years. > Now I want to truncate this history to the last 3 years. > > I tried some things but nothing works really. > What would

[git-users] Truncate complete history

2013-07-10 Thread ironm4nchen
Hello everyone, I have a repo with a size of ca 4 gb and the history is longer than 10 years. Now I want to truncate this history to the last 3 years. I tried some things but nothing works really. What would be the best approach to truncate the history? Do I need to remove all tags and branches

[git-users] Re: lots of files

2013-07-10 Thread Thomas Ferris Nicolaisen
On Wednesday, July 10, 2013 12:35:28 AM UTC+2, HWSWMAN wrote: > i want to setup git for my entire team, tons of files, many directories, > etc ... i do NOT want everyone to clone all these files to their machine, > but if they make changes, i want to track them ... for example on a shared > dri

[git-users] Re: git submodule add failed

2013-07-10 Thread Thomas Ferris Nicolaisen
On Tuesday, July 9, 2013 4:55:29 PM UTC+2, Maxim Yefremov wrote: > I want to add git submodule > > *$ git submodule add git+ssh://g...@bitbucket.org:userName/lib2.git > node_modules/lib2* > > Cloning into 'node_modules/lib2'... > ssh: Could not resolve hostname bitbucket.org:userName: nodename no