I want to use "git describe" to get the "revision number" of the application. Unfortunately, the git repository was created using cvs-import and has an ugly old tag, so I would like to change it. How can I change the tag given when using "git describe"? Note: I asked this on IRC today and found the answer myself in the end. Thought it ...
I am using this workflow: http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html where he mentions: "First, and while in your master branch (git checkout master), pull in the most recent changes: git pull origin master This should never create a merge commit because we are never working directly in master." Whoops, I j...
I just jumped into Git yesterday via Github and am moving away from svn. I created a private repo that I intend to use to keep my personal projects synced between work and home. During the process of creating the remote repo, my local files from work were pushed up. Last night, I was able to pull them down to my laptop at home. Now I ad...
Is it possible to ask git diff to include untracked files in its diff output? Or is my best bet to git add the new files I've created and the existing files I've edited, and use git diff --cached ? ...
We have recently started using git and had a nasty problem when someone committed a large (~1.5GB file), that then caused git to crash on various 32bit OSes. This seems to be a known bug (git mmaps files into memory, which doesn't work if it can't get enough contingous space), which isn't going to get fixed any time soon. The easy (for ...
I committed a bunch of large images to a git repo by accident and it slowed things to a crawl. I removed the images but doing a checkout still takes forever and the .git file is 300+MB. It looks like the .pack files are huge. Is there any way to clean this up? thanks ...
Is it possible for git merge to ignore line-ending differences? Maybe I'm asking the wrong question ... but: I tried uisng config.crlf input but things got a bit messy and out of control, specially when I applied it after the fact. For one thing, applying this config after the fact doesn't seem to affect files that were committed to t...
I'm having a website with many big images file. The source (as well as the images) is maintained with git. I wish to deploy that via ftp to a bluehost-like cheap server. I do not wish to deploy all the website each time (so that I won't have to upload too many unchanged files over and over), but to do roughly the following: In a git r...
Can somebody suggest a good tutorial on Git? I've found many simple guides with a plain web search, but I'm already very familiar with other version control systems and I'm looking for documentation on the internals. ...
Hi, I have a master branch in my project, that I use to pull changes from other people. From that, I usually have several topic branches on which I'm currently working. My question is: Is there a way for me to pull new changes into my master and then rebase ALL of my topic branches onto that at once? This is the situation: D-...
I am trying to use p4merge with git but I am getting: Error starting p4merge: "path/myFile" is (or points to) an invalid file (this lists the BASE, LOCAL, REMOTE, and standard version of the file). Git tells me about the conflict then it asks if I wanna start the mergetool configured (p4merge) and then I get the error above. Addition...
I have forked a repository on github some time ago, made a small change and pushed the change back to my github fork. The original repository has changed since. I would like to merge the changes from the original repository to my fork. I am new to both git and github, and I need specific commands how to do it. ...
How to provide file pattern rather a particular file in git-update-index --remove command? ...
Other than the database and log files are there any other files that should not be in the repository for security reasons? The project will mostly be worked on by myself however the code is to be stored on a shared repository which will be available to a few other users should they want to pull from it. The project is reasonably simple...
I would like to put a git project ( Rails app ) on github, but it contains certian files with sensitive data ( usernames and passwords, like /config/deploy.rb for capistrano ). I know I can add these filenames to .gitignore, but this would not remove the their history within git. I also don't want to start over again by deleting the /...
GitPython is a way of interacting with git from python. I'm trying to access the basic git commands (e.g. git commit -m "message") from this module, which according to this should be accessed through the Git module. Here's what I've tried so far to get these commands working: >>> import git >>> foo = git.Git("~/git/GitPython") >>> bar =...
Hi there, I was wondering, which tools are must have at the moment for a project driven by git vc in a windows OS. I am talking about GUIs, console apps, plugins for visual studio etc, etc, etc. ...
Hi, I am wondering if anyone has experience working on Django projects in a small team (3 in my case), using Git source control management. The project is hosted on a development server, which is why I am having such a problem. Developers can't see if their code works until they commit their changes to their local repository, then push ...
Hi! With Subversion one can setup access permissions per directory within repository. So eg. one group can have commit access to directory A, read on B - with exception that DevA has also commit permissions on B. How can one setup such a structure and permissions for Git repositories? ...
git log give us a really good functionality to know about what happened in the project. When we are in our machine and we have the cloned project is just executing the command. But I've realized that sometimes I need to read the log from somewhere else that is not my machine, so it would be great to ask for a log without having the repos...