Why does git think my cs file is binary?
I have just one cs file in my repository which git seems to think is binary (in git gui, it just says "binary files differ". Any ideas? ...
git
Undoing git reset?
What's the simplest way to undo the git reset HEAD~ command? Currently, the only way I can think of is doing a "git clone http://..." from a remote repo. ...
How Do You Get the bufspec While Using Vimdiff Through Git
I've read Vimdiff and Viewing differences with Vimdiff plus doing various google searches using things like "vimdiff multiple", "vimdiff git", "vimdiff commands" etc. When using do or diffg I get the error "More than two buffers in diff mode, don't know which one to use". When using diffg v:fname_in I get "No matching buffer for v:fn...
Android Eclipse test projects cannot be used with a project being built in an Android build tree
An Android Java project placed in a git repository and built in an Android tree in /packages/apps needs to have the project files located at the root of the git repository. This is problematic for creating a complementary Test project, which should ideally be included in the same git repository so commits are atomic for both code and te...
Listing each branch and its last revision's date in git
I need to delete old and unmaintained branches from our remote repo. I'm trying to find a way with which to list the remote branches by their last modified date, and I can't. Does someone know of an easy way to list remote branches this way? ...
How to check for changes on remote (origin) git repository?
Question What are the Git commands to do the following workflow? Scenario: I cloned from a repository and did some commits of my own to my local repository. In the meantime, my colleagues did commits to the remote repository. Now, I want to: Check whether there are any new commits from other people on the remote repository, i.e. "ori...
Take diff of two different git repositories
Hi, I have two seperate git repositories at ~/linux and ~/android. I want to make a diff of the two repositories using git. Or is there any way to merge the two repositories.? Regards, Murugaprabu ...
How do I force git to use LF instead of CR+LF under windows?
I want to force git to checkout files under Windows using just LF not CR+LF. I checked the two configuration options but I was not able to find the right combination of settings. I want it to convert all files to LF and keep the LF on the files. Remark: I used autocrlf = input but this just repairs the files when you commit them. I wan...
How to pull a specific file with GIT?
Say you just want to get rid of the changes you've made to one file, and get back to whatever is in the repository. I used to do this in svn: rm a-file.txt svn update a-file.txt What is the equivalent in Git? I know how to fetch/pull evrything from the repository, but how about one single file? ...
git - how to recover the file permissions git thinks the file should be?
I have a git checkout. All the file permissions are different than what git thinks they should be therefore they all show up as modified. Without touching the content of the files (just want to modify the permissions) how do I set all the files permissions to what git thinks they should be? ...
What is the standard or best way to deal with database branching with Mercurial or Git branches?
This has been a big question mark on my mind. I'm moving to Mercurial or Git very soon for my web software, and sometimes my branches require significant database changes which other branches should not see. This, I can't always share the same database for my branches. Is there some standard way of dealing with database changes for bra...
How to get to a particular git tag
I want v0.1.27 of nodejs code base. This is what I did. git clone git://github.com/ry/node.git cd node git checkout -b v0.1.27 However when I look at v0.1.27 code base changelog there I see changelog for 0.1.32 also. It seems I did not checkout v0.1.27. How do I checkout a branch from a tag? ...
How to automatically split git commits to separate changes to a single file
I'm prettyd comfortable with Git, an I've been using it for over a year now. Better yet, I've finally convinced a client to switch to it! However, I'm just plain stuck as to how to accomplish what I'm about to describe, or if it's even possible. Even it it can be done, I wonder if it could be setting us up for a messed-up, unmanageable r...
What are the benefits of Mercurial or git over svn for branching/merging?
I've heard for instance that merging branches with git or mercurial is easier than with svn. Reading last Joel on software blog entry, I didn't get it exactly why. Could you provide a concrete example where merging with git/mercurial lead to less merge conflicts compared to svn please? ...
Git: HEAD has disappeared, want to merge it into master.
The top image is the output of: git reflog. The bottom is what GITK in GIT GUI (msysgit) shows me when I look at all branch history. The last few commits do not show on GIT GUI. Why do they not show on GITK (at least as a branch or something)? How do I merge them into master? I gather this happened when I checked out tag 0.42. Why i...
Multiple Git repositories in one directory
Hello, I would like to deploy a directory to multiple developers having different permissions. So this is one thing Git cannot do. What about creating two repositories in one directory and assigning them different file lists by excluding files managed by the other repository with the .gitignore file. Example: /www/project/.git for all ...
GIT clone repo across local file system
Hi all, I am a complete Noob when it comes to GIT. I have been just taking my first steps over the last few days. I setup a repo on my laptop, pulled down the Trunk from an SVN project (had some issues with branches, not got them working), but all seems ok there. I now want to be able to pull or push from the laptop to my main deskto...
How do you do merges using Git, Eclipse and Egit
I, like many others, love Eclipse as my ide of choice, and because of the way I work (moving about, different places, different projects) want to use Git for CVS. There is a plugin for Git in Eclipse, Egit, which is now an official Eclipse project, and currently at version 0.7.1. As I've just started using it I'm interested in how othe...
Git exclude a commit in a branch
I have a commit, I have stored in a branch, because this should go only to a specific box. I have merged it to the branch master, but not the branch dev, that I use locally. Now, by mistake I merged master to dev and that introduced this commit to dev. I know can git revert sha, to branch dev; but since this is going to introduce a co...
Git merge of same and externally modified file
I have inherited some code (from zip file) from a developer and git initialzed, made changes and set of check-ins progressively. Now, the same developer released the same code with his changes and gave me the another zip file. How do i merge my changes which i have it my git repo and his recent changes from the second zip file conten...