So, I can import from p4 using git-p4 without any problem. Everything seems to work, but my PNG files (and perhaps others) are getting corrupted. I've read about gitattributes and the line ending issues, but nothing I do seems to change the end result. Broken images. My attributes file is: *.png binary Any ideas? As I understand it...
We're bringing some of our web development in-house and one of my goals is to get it under version control. Right now I'm looking mostly towards HG and Git, respectively. Bazaar was knocked out of the running due to some flaky behavior. The biggest points on my mind are: Access to our web host is FTP-only. This worries me a bit. The p...
Let's say I have a file A.cpp, and I notice an error on line 15 of the file. Let's say the error is a "const" on a function that returns a pointer to a member variable, meaning using const on the function is technically correct but semantically wrong. I would like to discuss the semantics with the author who made the change. Using git,...
The book 'Git Internal' mentions about using git as peer to peer content distribution network at p50, but doesn't have much detail. Especially how to have several branches which has tracking different files. Example: (working dir) a00.exe a01.exe b00.exe c00.exe c01.exe c02.exe Master branch tracks all files, while branch A only tracks...
I have a remote git server that has been working great for months. Earlier today a couple of my teammates said they were having trouble with git pull for one of our projects. I am testing it now and I cannot preform a git pull either. I was able to run git fetch once, but now that isn't working. When I look at the server processes fo...
Hi - I'm trying to dig up resources on how version control algorithms operate on data, and I'm especially interested in the way git's mechanism operates. I realize git does many different things, but in particular I'm interested in how history is saved and restored. I'd appreciate any links or article references anyone can point me to. ...
I'm trying to setup Fabric so that I can automatically deploy my Django app to my web server. What I want to do is to pull the data from my Development machine (os X) to the server. How do I correctly specify my path in the git url? This is the error I'm getting: $ git pull fatal: '/Users/Bryan/work/tempReview_app/.': unable ...
I want to make changes to a file in my repo, then force git to believe the file is unmerged and show up in git status like so: # Unmerged paths: # (use "git reset HEAD <file>..." to unstage) # (use "git add <file>..." to mark resolution) # # both modified: lib/delayed/recipes.rb # That's the entirety of my question. Rea...
I have one repository where a lot of large binary files live. Is it possibly set git to make it keep only last n number of commits? Such as i only want to keep last 5 copies of files in this repository history? But i would very like to not do this manually every 5 commits? ...
So I have cloned a project at github and fixed a patch. Since this is the first time Im working in git Im trying to figure out the best way to put it online. Upon checking out my own (cloned) repository on github there was only one branch: master. I created a branch, myfix, which now holds one commit, which is the fix for the bug. Sh...
Can I nest git repositories? I have: /project_root/ /project_root/my_project /project_root/third_party_git_repository_used_by_my_project Does it make sense to git init/add the /project_root to ease management of everything locally or do I have to manage my_project and the 3rd party one separately? ...
Hi, I am trying to follow this railscast tutorial for authlogic - and it points to the source here - I have git installed - how do I replicate the source onto my localhost so that I can follow the tutorial like in the screencast? Thank you! ...
I am about to create a patch file for a project. My branch is the "master" in my local repository. And the remote upstream branch is mapped to the local branch "origin". \ With this command I can compare the two branches and see all differences git diff origin..master [gives me a full patch format of all commits] But in this case, I'...
I'm trying to setup a fabfile to deploy my Django app. I can't figure out why I'm getting this error: Fatal error: local() encountered an error (return code 2) while executing 'git commit -m 'changed settings for prodserver' $ fab create_branch_deploy_to_prodserver [localhost] run: git checkout prodserver_server [localhost] run: git me...
Suppose I have a file "ChangeLog" in branch "master". I want to record information about all changes in any branch in this file (in more detail than in a commit message and with other descriptive information). I git checkout -b revA, perform edits, update ChangeLog and git commit. I then git checkout -b master. This checkout will rep...
I created a Git repository on a folder that had a different Linux owner than my user. It wasn't until much later that I set the group permissions to write so that my user could make changes and commits to Git. However, whenever I switch from a branch to master, all the group write permissions are lost. I've tried switching to the master...
As the title says, I'm trying to get an automated release job working on Hudson. It's a Maven project, and all the code is in Git. Manually, I do the release on my personal machine like so: git checkout master mvn -B release:prepare release:perform This works perfectly. The Maven release plugin properly pushes the release tag to th...
Hi, I'm looking for a way to list all updated files in the remote master branch, similar to svn log. Is that possible in Git? Thanks, Christoffer EDIT (Solution): git fetch git diff --name-status origin/master ...
Hi, I've read a great deal of "go from svn to git" and other "git-svn workflow" articles on the web, and still I think they often deal with overly simple situations. They are often targeted at guys who just want to use git and hack locally, without using the full power of git, like pull, fetch, merge and the like between multiple develo...
I'm setting up My First Git Repo, and on running; git config --list I've noticed I've got multiple entries for certain config values; core.autocrlf=input [...] core.autocrlf=false I'm guessing these values are doubled up because they appear in more than one of the various config files (system, global, file). My question is, which o...