I'm writing a simple parser of .git/* files. I covered almost everything, like objects, refs, pack files etc. But I have a problem. Let's say I have a big 300M repository (in a pack file) and I want to find out all the commits which changed /some/deep/inside/file file. What I'm doing now is: fetching last commit finding a file in it by...
Ok, I have three different computers that I work from and right now their configurations are all different so I have to push/pull a certain on each and its very bothersome. What I want to do is have ONE config file that I can use for all three that will allow me to do the following: git push unfuddle git pull heroku git push unfuddle gi...
I have made a little framework for php. In this project I have the basic functionalities that I use for most of my projects. I have also inserted some sample data so I do not forget how it all works again. I have put the framework under version control using git. Everything works fine now and I want to further build on this. This is my ...
Hi, How can I uncommit my last commit in git? I have googled it. Is it git reset --hard HEAD or git reset --head HEAD^ Thank you. ...
Hi All, Actually am try to get a report on merge conflicts. I used 'git blame' to see who has changed what line, but i couldn't find the branch and repository name information. Is there a way to find the repository name, branch name and author name of a file from 'git blame' or from commit ids' so that whenever a merge conflict occurs ...
I tried to remove GIT on my windows-XP, by means of the Windows/Configuration/Software menu. After some error message (which I cannot remember), it removed all files. I checked it, and there are no files with ptp in the name left on the entire system. A problem remained however: each time I opened windows-explorer, a nasty error message...
Using cvs, git or another technique (file system level?), I would like to: Make modifications on branch A Checkout branch B: Changes to branch A are "stowed away" (by name would be nice), branch B is checked out such that my branch A changes are gone Make modifications on branch B Checkout branch A: Changes to branch B are "stowed away...
Coming from mercurial, I'm using branches to organize features. Naturally I want to see this work-flow in my history as well. But I started my new project with git and finished a feature. After merging I realized that git used fast-forward and forgot about my branch. So to think into the future: I'm the only one working on this project....
I am using this function in Bash function parse_git_branch { git_status="$(git status 2> /dev/null)" pattern="^# On branch ([^${IFS}]*)" if [[ ! ${git_status}} =~ "working directory clean" ]]; then state="*" fi # add an else if or two here if you want to get more specific if [[ ${git_status} =~ ${pattern} ]]; then b...
How does gitmergetool works. I have conflicts while doing git merge and now I want to get rid of those merge conflicts and I was browsing SO to get some information on how to do it and there was one suggestion of using git mergetool, I have never used git merge tool but when I do use git merge tool than am getting some local, remotes and...
I would like to do something like: git history my_file possible output 2010-05-16 + add this line + more code here 2010-05-15 + delete code below - bad code - more bad codd 2010-05-12 + changes made here ...
Is there a way to include git commit hashes inside a file everytime I commit? I can only find out how to do this during archiving but I haven't been able to find out how to do this for every commit. I'm doing scientific programming with git as revision control, so this kind of functionality would be very helpful for reproducibility reas...
Greg's comment help me understand http://stackoverflow.com/questions/1698552/tortoisegit-push-successfully-but-no-new-files/1698657#1698657 How do i create a local bare repository with tortoisegit? I can right click and clone a repository from github and push. I would like to create a local repository then do the same thing, clone and ...
I would like to be able to take advantage of the benefits of GIT (and its workflows), but without the cost of disk access - I just would like to leverage the distributed revision control capabilities of GIT to produce something like a hybrid of memcached and GIT. (preferably in .NET) Is there such a beast out there? ...
How do I recursively add files by a pattern (or glob) located in different directories? For example, I'd like to add A/B/C/foo.java and D/E/F/bar.java (and several other java files) with one command: git add '*.java' Unfortunately, that doesn't work as expected. ...
Hi, I finally made a great step by abandoning SVN for Git and loving it. It must be somewhere, but I can't really find on how to do this, gitosis friendly. I have my repo 'site' stored on a remote machine. I push my working copy and pull this data on a production machine. One mayor difference though is 'one' file: database.yml, which ...
Hi, I understand how to create aliases in PowerShell for cmdlets fine but I want to create an alias in PowerShell for things like "git status" as just "gs" and "git pull origin master" as "gpm" can anyone point me in the right direction? I am sure I am missing something obvious. Many thanks Richard ...
I want to throw this scenario out there and see what the most objective, vanilla-Mercurial way to fix this would be. Suppose I have the following branches in my centralized Mercurial repository for my centralized, non-distributed web-app: repository default feature1 feature2 bugs Suppose ten developers have committed ...
I'm looking to git-svn a large repo on a busy and underpowerd svn server. I would like to tell git-svn to be polite and not lag the server for people doing real work. Can I do this? ...
Hi, I have two branch in my git repo: master seotweaks (created originally from master) I created "seotweaks" with the intention of quickly merging it back into master, however that was 3 months ago and the code in this branch is 13 versions ahead of "master", it has effectively become our working master branch as all the code in "m...