My app is hosted on Heroku and I have a public github repo too. My app has a config file containing my amazon S3 credentials. It's important to ensure that the file gets pushed to heroku but not github. So I was thinking that I could push my master branch to heroku and create a seperate github branch and ensure that it's .gitignore fi...
Here is the problem: I created bare git repository at my hosting partner place, which I use as the reference repository from all the locations/computers I maintain my project from. The thing is that my project is using a sqlite db file, which keeps growing regularly (it is about 150MB for now). As time is passing, my .git folder is get...
I want to use my Linux home server as a central repo for having access to my git projects anywhere. I've heard about gitosis, but was wondering if there might be a simpler/better way, maybe more native to linux and git itself (i.e. no python), to do this ? ...
I am experiencing strange behavior using git stash, I have two branches v0 and v1, v0 is in sink with my master branch and also with remote repo copy and v1 is the one I checkout which was similar to v0 but now I have some changes in that. So now v1 is different to v0. Now I want to see what is there in v0 and so I do git stash on v1 b...
Okay, about 700 commits ago (>30 days) I accidently saved ThirdParty/mapper/Songbird_1.2.0-1146_windows-i686-msvc8.exe (iTunes type of download) in my local Git repository without noticing, which was also pushed to remote hosted git repository, I noticed the other day the repo was in excess of 200mb, whilst I was expecting about 20mb. I...
Hi, I was wondering if anyone could help me with the following. I work remotely with other software developers on the same project. I use subversion and tortoise to manage my code. I don't think the other developers do the same. This creates problems when we try and share code, because we have to figure out which files were modified so ...
I have a main repo (repo 1) that I work with. I have another repo (repo 2) that needs to fit into the first one and I'm not sure how I could have them both in the same folder. The idea is that I have a standard codebase that I need in each project - yet each project is it's own git repo. /project /.git(repo 2) /.git(repo 1) ...
I have a repository that I work in. There's one folder in there where I put all the stuff I want to open source so it's separate from the private parts. Is there a way to automatically get git to push anything committed to that folder to a github repository without me having to remember to push the newly changed files up there every time...
Is there a way to determine when a git branch was created? I have a branch in my repo & and I don't remember creating it... thought maybe seeing the creation timestamp will jog my memory. ...
Hi I have created a fork from a project on GitHub. How can I now pull changes from the project that I forked from? Thanks for tips and answers, Regards Ran ...
Drupal has a GitHub repository at http://github.com/drupal/drupal I, being a newbie to Git and the DVCS world in general, and having trouble figuring out how to use this repo as a method for keeping my Drupal core up to date, so I have the following questions: Is this the best way to check out a specific tag from the repo? git clone ...
I see a lot of sites referring to git, github, svn, subversion etc, but I never really knew what all of those things are. I also hear a lot of terms like 'svn repo', 'commit', and 'push' - I tried googling but it seems that I have so little knowledge about the subject that I don't even know where to get started. Could someone give me th...
Hi, When I do git log in certain places the output is messed up and it doesn't bring me back to the command line. In some of my repos it works fine however. Any ideas? Output is pasted below: [server]$ git log commit c84acb29115822d94fe0112bacfb835911ffaa11 Author: My Name <[email protected]> Date: Sun Feb 14 03:13:05 2010 -...
I've started switching my private subversion projects to git (Github) and release the code to the public. Therefore, I am a git newbie. Unfortunately, there is a revision of a project that contains confidential data. The revision is not tagged, I just know its hash value. Is there a way to completely erase that particular revision from...
A lot of people like git (in particular this guy) against other SCMs such as SVN, but many projects, even new ones, are set up using alternative SCMs. Furthermore, Google Code still does not support it (although many of their large open source projects use it). My question is: what are the reasons for not using git in any project, wheth...
This feels like im missing something obvious, but i've been reading tutorials for 3 days and can't seem to make it happen. I have a private repo on github. I want to run it as two separate branches. As I understand it, I clone the repo so its on my local machine, then branch it using git branch newbranch git checkout newbranch so fa...
ref^ refers to the commit before ref, what about getting the commit after ref? For example, if I git checkout 12345 how do I check out the next commit? Thanks. PS Yes, git's a DAG node pointer struct tree whatever. How do I find the commit after this one? ...
Hi SO, I'm comfortable using git, and I prefer it very much over CVS. Unfortunately, in our company, we have to use CVS as a version control system. I was wondering if there was anyway to use git locally while committing to the CVS repo, and I was elated when I found this SO question. Unfortunately, it does not seem to work on Windows. ...
I'm in process of integrating GIT version control system into 3ds max to control .max file versioning. I tested git with max files for several weeks and have found that it suites my needs, but, anyway, git is little bit overcomplicated for this kind of tasks. What I'm looking for is the program that works just like (well, almost) git, b...
Are there any tools available that will let me rebase in git style an SVN branch onto a new parent? So, in the following situation, I create a feature branch, and there are commits to the trunk E---F---G Feature / A---B---C---D--H--I trunk I'm looking for a tool which copies the trunk, and applies the comm...