My personal Wordpress install is cloned from the wordpress git mirror on GitHub. I checked out the 2.7.1 tag to the branch "stable" (git checkout -b stable 2.7.1) and its been running fine since. Now WordPress 2.8 has been released I want to move my stable branch to the 2.8 tag. I tried the following (all on the stable branch) but get c...
Is there a way to trigger a hook after a new branch has been checked out in Git? ...
We are working with a 3rd party PHP engine that gets regular updates. The releases are kept on a separate branch in git, and our fork is the master branch. This way we'll be able to apply patches to our fork from the new releases of the engine. My problem is, after many commits to our branch, I realized that the initial import of the e...
Hello! I am tracking a project with git. There are some Xcode project files in the working copy that I want to keep tracking, but do not want to see in diffs, because there are always dozens of changed lines that I am never interested in. Is there a simple way to have git-diff skip these files? I’ve tried to set up a custom “silent” dif...
I still have XP on my laptop and have installed Git so that I can do some work on it. When I clone a repository from my server (which is linux) it automatically adds carriage returns onto each line. So now Git thinks that every file has been modified when, in fact, they haven't. I've tried adding the following lines to my .gitconfig fil...
I have a small patch saved away in my git stash. I've applied it to my working copy using git stash apply. Now, I'd like to back out those changes by reverse applying the patch (kind of like what git revert would do but against the stash). Does anyone know how to do this? Clarification: There are other changes in my working copy. My...
We have a git repository which contains source for a few related Java WARs and JARs. It would be nice if the Java code could somehow: System.err.println("I was built from git commit " + commitID); (Obviously real code might be putting this into an HTTP header, logging it on startup, or whatever, that's not important right now) We are...
I have the following PHP script: #!/usr/bin/php <?php echo shell_exec( "/usr/bin/git clone --bare ". "/home/dave/create_project/template_project ". "/home/dave/create_project/my_test_project.git" ); About 7 in 10 times that I run it, git gives the following error: find: write error: Broken pipe This error never occurs if I run...
Today I was looking through the logs for a project and realized that I fat fingered a tag name some time ago. Is there some way to rename the tag? Google hasn't turned up anything useful. I realize I could check out the tagged version and make a new tag, I even tried that. But that seems to create a tag object that isn't quite right. Fo...
I enjoy using the egg git-front-end in emacs, but I can't figure out how to do an interactive rebase to squash several commits into one. I know how do do in from the command line, but I can't see what egg mark to use (+ . *) and which egg command (r R) to apply. BTW. Is there a way to do git svn rebase and git svn dcommit from within eg...
Assuming that I know there is a git-daemon running at git://git.mycompany.com, how can I list all repositories served by that specific instance? Update: I don't have shell access to git.mycompany.com. ...
145M = .git/objects/pack/ I wrote a script to add up the sizes of differences of each commit and the commit before it going backwards from the tip of each branch. I get 129 megs. That's without compression and without accounting for same files across branches and common history among branches. Git takes all those things into account so ...
Hi, We're using git submodules to manage a couple of large projects that have dependencies on many other libraries we've developed. Each library is a separate repo brought into the dependant project as a submodule. During development, we often want to just go grab the latest version of every dependant submodule. Does git have a bui...
Hi, I'm trying to use git on windows to clone a remote repository. I can clone it on my mac fine but on windows I get a problem. WHen using git bash to clone, I get a message saying the server's host key is not cached in the registry. It asks me to preess y or n to trust the host. THe problem is that if I press y or n nothing happens....
Documentation says: "Because git-cherry compares the changeset rather than the commit id (sha1), you can use git-cherry to find out if a commit you made locally has been applied under a different commit id." Let's see: $ git cherry master release-1.1.0 | head -1 - 533e2559342910fbffa2be5b38fdd7f2ddb2ed53 $ git show 533e2559342910fbff...
I am using Git for a Visual Studio solution. Here is the structure of the sol. myProject.Domain, myProject.Common, myProject.Core, webClientForCustomer1, webClientForCustomer2 As the names imply, webClient projects all depend on Domain, Common and Core projects. I create a new web client app for each customer and make UI customizations...
I have an upstream repository with some changes. I have local changes I want to rebase onto the upstream changes. I want to know what files I've changed locally have also changed upstream so I can check any automatic merging. Alternatively, I'd like to manually do any merges during the rebase. ...
Since i switched to git from svn i started make more commits every time i recompile and my tests pass i commit my work. In the end i end up committing function by function. I also track some other projects using git like emacs,wordpress etc. I see that they do not commit that often. So i am wondering how ofthen do you commit? ...
Given the following constraints, how can I use GitHub from Windows and Unix? All access to the internet is restricted to a proxy The proxy only allows connections out on port 80 and 443 CONNECT method is only enabled for 443 Proxy Authentication is required (NTLM or Basic) ...
I use git svn to track a SVN repo. When I try to do a git svn rebase I am getting this error: Incomplete data: Delta source ended unexpectedly This is a large repo, with a long history. Just fetching the original single revision took almost 90mins, so I don't want to reclone. Are there any ways to track down which file is causing t...