git

Does maven-release-plugin push tags to remote Git repository?

When using the maven-release-plugin with Git, mvn release:prepare happily tags the release in the local repository. I'd expect mvn release:perform to push the tags to the remote repository, but this doesn't seem to happen. Am I mistaken? If not, is there an option to enable pushing release tags to the remote repository? ...

git - remove file from the repository

Hi, I know there's a million similar questions already, but I'm not sure they apply. I am new to git, and have a project hosted on github. I accidentally added some big log files to the repository. When I noticed it, I git rm-ed them and then commit-ted the changes. That seems to have done the job, in that when I clone the repository, I...

git rebase conflict was caused by which commit

when I do git rebase master I get conflict sometimes. And sometimes it becomes very difficult to track down an issue even with error messages. It would be a real help if I could find out which commit git is trying to reapply and is causing conflict. How can I find out which commit is causing the conflict? ...

What happens when amending an old commit with git?

I don't really understand what happens if I check out an old commit, do some modifications, and commit using git commit --amend. Will that change automatically propagate to future commits? How does it work? ...

git rebase branch with all subbranches

is it possible to rebase a branch with all it's subbranches in git? i often use branches as quick/mutable tags to mark certain commits. * master * * featureA-finished * * origin/master now i want to rebase -i master onto origin/master, to change/reword the commit featureA-finished^ after git rebase -i --onto origin/master origin/mas...

Git - Is there a way to view the number of lines committed by Author?

Does anyone no of a command or script that will output each author that has committed to the project followed by the number of lines they have contributed. e.g. something similar to the following: Author Insertions Deletions Bob Dole 1240 409 Sarah J 481 140 Jim Helper 388 23 Cheers, Ben ...

GIT repository layout for server with multiple projects

One of the things I like about the way I have Subversion set up is that I can have a single main repository with multiple projects. When I want to work on a project I can check out just that project. Like this \main \ProductA \ProductB \Shared then svn checkout http://.../main/ProductA As a new user to git I want to exp...

How do I get Eclipse CDT to ignore files

I have a C++ project in Eclipse. The project uses Perforce and Eclipse has the Perforce plugin installed. Everything was fine, until I decided to create a git repo in my project. I created the git repo to snapshot some changes which I wasn't ready to commit. Everything was fine until I refreshed my files in Eclipse. Two problems hav...

Reverting a single file to a previous version in git

Is there a way to go through different commits on a file. Say I modified a file 5 times and I want to go back to change 2, after I already committed and pushed to a repository. In my understanding the only way is to keep many branches, have I got that right? If I'm right I'm gonna have hundreds of branches in a few days, so I'm probabl...

Programmatically printing git revision and checking for uncommitted changes

To ensure that my scientific analysis is reproducible, I'd like to programmatically check if there are any modifications to the code base that aren't checked in, and if not, print out what commit is being used. For example, if there are uncommitted changes, it should output Warning: uncommitted changes made. This output may not be repr...

GIT: clone works, remote push doesn't. Remote repository over copssh.

Hi all, I've "setup-a-msysgit-server-with-copssh-on-windows", following Tim Davis' guide and I was now learning how to use the git commands, following Jason Meridth's guide, and I have managed to get everything working fine, but now I can't pass the push command. I have set the server and the client on the same machine (for now), win7-...

How to get --detect-branches to work with git-p4?

My p4 repository has a structure similar to: //depot/project/branch1 //depot/project/branch2 //depot/project/branch3 ... etc However, when I use git-p4 to clone "project", all 3 branches are not considered as branches and all get cloned into the single master branch. This is how I'm invoking git-p4: git-p4 clone --detect-branches ...

Definition of "downstream" and "upstream"

I've started playing with Git and have come across the terms "upstream" and "downstream". I've seen these before but never understand them fully. What do these terms mean in the context of SCMs and source code? ...

Reordering of commits

Hi, I'm currently working on a branch and want some commits to merge into other branches: /--a--b--c--d--e--f--g----- branchA (letters are commits) --o--------------------------- master \-------------------------- branchB However I noticed that it would be a good idea to pool some commits. I want to "concatenate" commit a, d, e...

Grabbing git log from other folder

I'm trying to output a git log from another folder on the server without having to cd into it first. git log /path/to/repo returns fatal: Not a git repository For the life of me, I can't find the switch to tell it to operate on/in a different path than . Thanks. ...

How to thoroughly clean up a ruby on rails project?

Hi, I am very new to ruby on rails. I've installed a complicated ruby on rails project via github clone and bundle install, and I was making minor changes to it until it reaches a point whereby it is not stable anymore, sass was throwing strange exceptions, so did other ruby gems. For a rails project, is there a way to clean up the proje...

Git repos over multiple machines - backups and keeping in sync

I'm new to git so please feel free to RTFM me... I have multiple development sites (none of which can communicate via a network with each other) and am working on a few projects (with a few people) at any one time. What I would ideally have is at each site a centralized repository that can be pulled from but development would occur in ...

github like workflow on private server over ssh

I have an server (available via ssh) on the internet that my friend and I use for working on projects together. We have started using git for source control. Our setup currently is as follows: Friend created repository on server with git --bare init named project.friend.git I cloned project.friend.git on server to project.jesse.git I t...

How to clone and deploy a historical commit

Hello, I have been using git but not to an advance level because it's just me who pushes the commit to the github server and so i know any conflicts that arises if any. Now there's another developer working in another part of the world who also pushed some updates to the github repository. My problem is most of his work are not yet prod...

Shared Hudson installation - how to enable access to git over ssh?

We are trying to set up a Hudson server and share it between different projects. Hudson authenticates users against our Windows domain AD, and the project based security matrix makes it easy to manage who can access which projects. Remaining issue is, that most of the projects use git over ssh. Is there a way to make shared Hudson acces...