use Winmerge inside of Git to file diff
Is there a way to use Winmerge inside of Git to do Diffs? Thanks ...
git
Change old commit message on Git
Hi, I was trying to edit an old commit message as explained here. The thing is that now, when I try to run rebase -i HEAD~5 it says interactive rebase already started. So then I try: git rebase --continue but got this error: error: Ref refs/heads/master is at 7c1645b447a8ea86ee143dd08400710c419b945b but expected c7577b53d05c91026b99...
Recovering from forgetting to .gitignore
I have been caught out by what appears to be a common enough problem for git newbies. I forgot to .gitignore a particular file, and adding it to .gitignore after having committed makes no difference. I found this page on gitready which explains how to remove a file from the repository without removing it from the working tree (by using...
GIT clone to external drive for backup
Hey, Go easy on me, I'm not much of a command line man... We have GIT set up within our windows network (using msysgit & GitExtensions). We each have our own repositories and we push to a remote 'bare' repository on one of our servers. All good. I'm trying to set up a scheduled job on the server, which will clone a repository from th...
git: ignoring files in the origin
Is there a way to tell git to ignore a file that's stored in its origin? Since the files in question are in the upstream repository, just adding them to .gitignore or .git/info/exclude don't work. Background: My upstream repository has some generated files in it. Every time I do a local rebuild, these generated files are changed and ...
git-diff to ignore ^M
In a project where some of the files contains ^M as newline separators. Diffing these files are apparently impossible, since git-diff sees it as the entire file is just a single line. How does one diff with the previous version? Is there an option like "treat ^M as newline when diffing" ? prompt> git-diff "HEAD^" -- MyFile.as diff --...
If GIT doesn't track file renames how do we keep from losing these changes in merges?
In our application we often need to rename a file/package on a release branch and then merge this change (along with many others) to the trunk. A big problem is that many SCM solutions (our current is SVN) do not track file renames. When we go to merge a release branch of our product back to the trunk it becomes easy to lose these chan...
how to capture the result of `git status` in a Rails action?
If you run this code in a controller action (notice the backticks) def index … `pwd >> tc.log` `git status >> tc.log` `ls >> tc.log` … end , only the 1st and 3rd command will pipe their output to the tc.log file. I'm trying to get the output of git status (f.ex) in a controller action and have tried many variations (captur...
How do I handle git branches in OpenGrok?
We want to index our (fairly large collection of) git repositories using OpenGrok, and the one thing I haven't been able to figure out is how to index all the branches. From what I can see, it looks like I need to have checked-out copies of each branch that I want to index, so, if a repository has, say, a dozen branches, I need to have a...
How do I fetch/clone only a few branches using git-svn?
The SVN repository that I am working with has a rather large number of branches. I am only interested in working with three of them and maybe another new SVN branch that will be created in the future. What I have figured out so far is that the command git svn clone URL -T trunk -b branches -t tags will clone all SVN branches and subseq...
How do I acquire a "cleansed" Git repository?
Hi All, I can't seem to find the answer to this seemingly simple question, anywhere: How do you acquire a clean copy of a code repository once you "release" it? For instance, say I'm at a place in my Git repository where I want to release a copy. How do I copy it without all the Gitiness? I don't want any hidden Git directories, etc....
Tips on using Git with svn in presence of a large number of svn externals
I have a workflow(on svn) which I am trying to replicate with git, but am unable to. I have a large number of Django apps (which are plugged together to form a form a full project) Some of these are in one large repo and others are in smaller repos. My layout looks something like, app1 -> repo1/app1 app2 -> repo2/app2 app3 -> repo1/ap...
Git, Revert to a commit by SHA hash?
I'm not sure why this doesn't make sense to me, I'm not clear on how git revert works, for example I want to revert to a commit (like 6 commits behind the head). Say it's sha hash is: 56e05fced214c44a37759efa2dfc25a65d8ae98d Why can't I just do something like: git revert 56e05fced214c44a37759efa2dfc25a65d8ae98d ...
Problems using git merge
I'm fairly new to git. Just a few minutes ago, I performed a merge on two branches; let's call them A and B. I was 'on' branch A; my next command was 'git merge B'. It said there was one conflict, but I looked in the file and there were no conflict markers. I added the file, committed the change, and did the merge command again. "Already...
github how to checkout production branch
I have a private project hosted on github. I have a production branch of that project. I got a new machine and I need to fix something on production. This is what I did. git clone [email protected]:userid/project.git # now I have master branch git co -b production git pull origin production Using the above mechanism I am able to get prod...
how does git handle merging code that was moved to a different file?
Say I have function X in file A, and I wanted to move that function to file B. In the meantime, somebody else made changes to function X in file A. Does git do anything special when merging those two changes? Would it recognize the same function was moved to file B and apply the changes there? Or would we end up losing the changes or h...
Git core.editor on Mac OS X
How can I change the core.editor of Git to start a program such as Smultron? All I can find are examples for terminal editors or TextMate. ...
Git post-receive hook acts differently to shell
I'm trying to setup a git repo on my live server to automatically update a subdomain on receive. Using this guide http://toroid.org/ams/git-website-howto. hooks/post-receive #!/bin/sh pwd git checkout -f config [core] repositoryformatversion = 0 filemode = true bare = false worktree = /var/www/vhosts/...
How can I get full filenames from Git difftool (for Microsoft Word "Compare Documents" feature)?
I am using the latest version of Git (1.6.6) on a Mac. My wife wants to use Git to manage her fiction writing as long as she can still use Microsoft Word 2008 (Mac). Instead of pushing her into saving everything as plain text, I would like to use Git Difftool to pass the files to Word and use Word's Compare Documents feature. She wouldn'...
git svn fetch fatal: write error: Invalid argument
Odd situation is happening when I try to clone a remote svn repository. When I type: git svn fetch Git will fetch the first 20 revision of the remote repository then at some point after 20 revisions it fails and just prompts the following error message. fatal: write error: Invalid argument Then just sits there doing nothing else. Rep...