Is there any way to undo the effects of "git revert head"?
I've accidentally run the command against the wrong branch in my repository - is there a way to undo this change? ...
git
Best practice for modifying an already-merged git topic branch
We use the following git workflow at my company when coding up a new story: Create a topic branch off of master (production/stable) Create as many commits as desired to implement feature. do a git merge --squash of that topic branch onto the qa branch. QA people review. If good, the code is merged into the ua branch. If the User Accept...
New Git User: Suggested Workflow Help (Specific Example)
Hello all, I have read most of the Progit Book and this tutorial as well. I think I am getting a very good idea of gits power, its low-cost branching, etc. However, I have a very specific example that I need help with that I think will better help me understand how to bring Git into my workflow. I have a document with an essay in it. ...
Pushing without a commit in Mercurial or Git
Seems like for both Mercurial or Git, if I don't commit first, then I can't push? So if I don't commit (when not ready yet), I can't push to a remote server to back up my code? The code is in a notebook computer, being carried around, which can be somewhat fragile being carried around. ...
Using git for the first time...
I want to add a project which is located in my documents into a git repository, is this do-able? Thanks, I've never used git before ...
git version control with local files
Ok I have a project in a folder called mywebsite which is located in my documents folder on my mac. How do I use git to version control this folder?? Every time I try something I end up with a fatal error of some sort and it's really annoying me now, can you help? I do git init, then mkdir and then I've tried adding and cloning the fil...
Branches transferred with svn2git
This question might be down to the fact I don't understand how branching works technically in SVN and Git. But when I use svn2git some of the branches are in refs/remotes/ and some are not. For instance trunk is /refs/remotes/trunk. And when I check the master branch in the new git repo, it is not the svn trunk but some old branch from...
Showing Git branch structure
Is there a way to show only the branch structure in Git? There are a number of tools that show the commits graphically, but in my case the list is so long that it's impossible to see the structure. I guess git-log could be the answer, but I can't find any switches that only show the branching commits. This along with "--graph --branches ...
git-update-server-info not sufficient to clone remote repo?
I'd like to make a git repository available over a Nginx HTTPS server. I've set the post-commit hook to run git-update-server-info in order to update the refs for the "dumb" backend. Pulling updates over the HTTPS interface works fine, however, when initially checking out the repository it fails with: [test@test ttt]$ git clone https:...
git ignore exception not working as desired
WinXP + mysisGit1.7 In my .gitignore file, but still can't see Demos/path/to/file/file.cpp being tracked by git. I have below entries: Demos/ !Demos/path/to/file/file.cpp The absolute path is: c:\Project\Demos\path\to\file\file.cpp What could be wrong? Please help, thanks. EDIT: I found the way how mysisGit .gitignore work on ...
git removing commit history of some files from a branch
hello, i've started development of some little project and did not use feature branches. now i would like to release a little part of this project, because it's stable enough to get released. what i would like to do is: create a "release" branch with only the commits of this part of the project and ideally remove the other parts comple...
Bunlder, Rails3: how to avoid git check of edge gems in :test group during deploying?
I have such lines in Gemfile: group :test do ... gem 'cucumber', :git => "git://github.com/aslakhellesoy/cucumber.git" ... end When I try do deploy on server via bundle install --deployment --quiet --without development test, I get an error: sh: git: command not found ** An error has occurred in git when running `git clone "g...
In Git, can I view all commits from a branch merge?
I'm working on a project and I see several merge commits from another developer. For some reason, he was merging an unfinished topic branch into our master branch on a daily basis. I want to see all the commits from his topic branch, but I can't just check it out because it was never pushed to the remote repo. So what I want to know is...
getting ssh-agent to work with git run from windows command shell
Hello! I have msysgit installed, with OpenSSH. I am connecting to a gitosis repo. From the git bash, I have created a .profile file that runs ssh-agent (if not already running) each time git bash is opened. Here is my script: http://www.cygwin.com/ml/cygwin/2001-06/msg00537.html I am also using git extensions, which runs the git com...
Git: how to see work that was done on a branch which is now merged
We're about to move from svn to git, and one of my users has a question. We have a number of long-lived release branches. Periodically they get tagged (rel_foo_10) and merged back to the master. We need to be able to list all the commits that were made on the release branch. Doing git log master..rel_foo_10 (show all commits reachabl...
Pushing just one revision to GIT repository
Hi, i am working in a project and as i make one change i commit it. Then, after commiting 3 or 4 changes i push it all. What i would like to do is to push just one of those revisions that i have locally. can i do that? How? Thanks ...
Git: automatically keep a secondary repo in sync with a primary repo?
We have a two tier setup. We have a primary repository (called 'primary' below). And a secondary repository (called 'secondary' below) that was created like so: $ git clone --bare --shared $REPO_A/primary secondary.git People working on the secondary repository view the branches which originated from the primary repository as read o...
Speedup and Caveats with Git cvsimport?
hi all, we're trying our hand at migrating from cvs to git. Our goals are 1) perfect current codebase 2) usable history. If it's missing an entry in an old branch, we don't care so much. Two comments: Even with a local copy of the cvs repository, it takes a very long time. The dry run took over 24 hours (7.5 gb cvs codebase; P4 2.0...
How to extract a subset of history from Git?
Update: I tried to simplify the real example here to get a clear explanation of my options, but that didn't really work. The linked examples below so far are too general to get even this simple example working. I was able to do this type of thing with SVN all the time and got quite skilled at it. Now I'm finding it extremely difficult i...
Can you delete multiple branches in one command with Git?
I'd like to clean up my local repository which has a ton of old branches, let's say 3.2, 3.2.1, 3.2.2, etc. I was hoping for a sneaky way to remove a lot of them at once and since they mostly follow a dot release convention, I thought maybe there was a shortcut to say: git branch -D 3.2.* and kill all 3.2.x branches I tried that comm...