I have a git repo hosted on my server using gitosis. I had branches master and template, I renamed the template branch to develop and pushed the develop branch to the gitosis repo which created a new branch named develop, but if I look in the repo_dir/refs/heads dir of my gitosis repo the template branch is still there, how can I remove ...
Hi, Consider this part of a repository of mine: / myproject django -> django/master (django/django @github) ... other dependencies django is a subtree that I merged following this howto: How to use the subtree merge strategy Now I found out that another dependency is incompatible with the current master of django and I want to sw...
We have project (PHP application), but instalation for each client vary, sometimes very little, sometimes more. Still, big part of source code is common. We manage specific installations as parallel branches to master branch and we need to transfer changes from master to other branches. Same situation was solved in Git: how maintain (mos...
If I have a bunch of uncommitted changes to a single file in my working directory in Git, what's the easiest way to selectively pick and choose among these changes? My current way is to "git diff" the file, and then manually review the diff alongside the actual file. If I want to restore bits of old code, I can copy and paste from the ...
Is there anything like SVN Monitor for Git repositories? Something that will enable me to monitor checkins and do comparisons. ...
I would like two things: to be able to change branches in git, and then Run or Build in Xcode without recompiling the entire project. have git ignore intermediate build files during merge, so it won't ask me to resolve any conflicts. Putting the intermediate builds folder outside the project, or using .gitignore to ignore that folder...
Hi Git masters! This one is for you! I have cloned a repository and the master branch in my repo is tracking origin/master. I created a work branch and changed some config files specific to my dev machine to make the app work. My normal workflow will be to switch to master branch, merge changes made in work branch and push those change...
I like to use git add --patch (and more recently, git add -i) to untangle my commits as well as verify that what I'm committing is good to go. Once in a while I'll come across a hunk that might be an error logging statement, an extra newline (usually from erasing the aforementioned logging statement) - something that I'd actually rathe...
At first: This is (hopefully) no duplicate of this or this. The current status: I committed a file with credentials for an internal database to my Git repository. This was fine, as I used it only alone. Then my group started to clone, push and pull around in this project. We now have several Git repositories (one central and some develo...
Hi, I'm developing a project on my personal computer (a Macbook). I'm using it to version it. I have another computer (the one I use at work) where I'd like to develop the same project in daytime. I have a free account at github, so I could use it to keep the work going syncing home and work development, but the project is not "public"...
How can I see which commits are actually going to be pushed to a remote repository? As far as I know, whenever I pull master from the remote repository, commits are likely to be generated, even if they're empty. This causes the local master to be 'forward' even if there is really nothing to push. Now, if I try (from master): git cher...
I had checked out an old hash (commit) and was working on it, checking in merrily and ignoring warnings that I wasn't working in a branch. Then I switched to a branch and realized that I had no way to get back to my orphaned checkins (luckily I had the terminal window open still, so I checked it out and branched). How can I get GIT to ...
I'm working with a git repository using git-svn. Everything went fine until the day the maintainers of the svn repository decided to move the repository to a different URL. How can I tell my git-svn client to fetch from the new svn repository? I've changes the svn URL in the svn-remote of .git/config but now I get the following error: ...
Is there any way to know or get the original create/modified timestamps? Thanks. ...
I have two separate git repositories. One is mine, and has "Branch A", the other was developed by someone else and has "Branch B". They both have the same master branch. How do I import his branch inside my git repository? So I want the result to be: $ git branch Branch A Branch B master ...
I am writing a series of script for zsh/git management. How do I check if the current directory is a git repo? (When I'm not in a git repo, I don't wnat to execute a bunch of commands and get a bunch of 'fatal, not git repo' responses). Thanks! ...
I wnat to do something like: if [[ git status &> /dev/null ]]; then echo "is a git repo"; else echo "is not a git repo"; fi except I don't know how to do checking on the exit status. How do I fix this? Thanks ...
I decided to delete a few branches from a (personal project) repository of mine that were merged into master after confirming on #git that leftover branches aren't really necessary. However, gitk's visualisation of my repository's history as a result has been completely screwed up. Basically something like this: With those branches ...
My app, in my filesystem, works just fine. All tests pass. I'm a sole developer, using Git mostly to use Heroku as well as for backup. Git has stopped working because of corrupt objects. I'm getting errors that look like this: steven-nobles-imac-200:drominay steven$ git push heroku master error: inflate: data stream error (invalid di...
Is there a command line argument to pass to git diff and other commands, that use the less pager by default. I know I can pipe it to cat; but that removes all the syntax highlighting; I know I can set the pager in the global .gitconfig to cat by GITPAGER=cat (or something like that); but I want to have pager sometimes (depending on the...