I have a separate git repository for document templates that I have no control over but whose contents need to be included as a folder in my final WAR. The versioning of these do not matter and the latest ones should always be used when packaging the war. Is this possible with Maven or do I need to script something separately? I would v...
Hi, I need a way to export a stashed change to another computer. On Computer1 I did $ git stash save feature I'm trying to get the stash patch to a file and then import it to another computer $ git stash show -p > patch This command gives me a file that I can move to another computer where this repo is cloned, but the question is ...
I am trying to use git as something it wasn't made for - a database. Please feel free to tell me that this is a stupid idea. Setup One branch (let's call it robot) is being updated automatically by a script on a daily basis. The data comes from some other publicly available database. Initially the master branch is the same as the ro...
Hi, I just committed the wrong source to my project using -FORCE. Is it possible to revert? I understand that all previous branches have been overwritten using -f, so I may have screwed up my previous revisions... I'm a bit of a newbie with GIT. ...
I have a Trac installation with the Trac-Git plugin. When committing to git, I can use TracLinks to reference to a Bug by using a prefix bug:123 or #123 and the changeset is linked to the bug. I want to achieve the reverse effect now. On a given ticket, I want to see a list of all the Changesets associated with it. I read in other thread...
Hi, I develope on Windows at home and send my changes to the customer. Customer do not want to have any SCM installed, so I need to send files I've changed from last iteration. Currently I'm using Subversion with some kind of the automation by self-written batch, that is a mix of windows and GNU/unix utilities. The script looks into the ...
Hi there, I've got some trouble with a git setup I wanted to use in our company. I set up a git "server" with the main code repository on a ubuntu hardy machine with git 1.5.4.3. I'm new to git and set up this repository step by step with tutorial. git init git add . git commit -m "initial commit" Then I set up a client (Win XP) git...
Subversion works great when we have access to central repository, but sometimes two or more developers work at client where they do not have connection to central repository. I am looking for DVCS that can help us where off-line. It should: cooperate with Subversion repository so developers can checkout before leave, commit locally wh...
I've got a problem with a project respository setting in Redmine, in that; I've tried to set a repository with GIT, entered an invalid GIT path, and now I'm stuck as I can't seem to delete the path which has been set. Clicking delete sends me to the next page, stating that the following; Ideally I want to delete this repository refer...
I have a coding project that I would like to maintain at GitHub. I went to http://github.com and created an account. I downloaded and installed Git on Windows 7 choosing the option to use it via the command line. Through some googled tutorials I created an SSH key. I'm following the following instructions: But when I get to "git c...
Hi, I am new to git (been using svn and mercurial for awhile). Is there a way to 'tag' my git repository? Something like tagging it "version 12, removed red square.". I'd like to pull the source state at the time the tag was added, if I ever need to revert to a known snapshot of the code. Is it possible? Would be cool, if a year from no...
I have two projects, A and B. They were poorly divided, because A had to run one part before B and another part after B. So I decided to merge them. B's contents were copied into A's working directory, committed, and work continued from there. Of course, B's history was not preserved in the copy-paste. I want to fix this before it's for...
I have two git repositories, like this: proj1 proj2 proj1 has a tag v1.0.0 and proj2 has tags v2.0.0 and v2.1.0. Now I would like to merge proj1 (the v1.0.0 tag in particular) into proj2 as if it was an earlier version of proj2, so that I have the tags v1.0.0, v2.0.0 and v2.1.0. I'm also fine if I have to merge proj2 into proj1 or me...
I have created a local branch X that at some point I pushed to remote server (origin) git push origin X I realized it's a bad idea to have branch named X and want it to be called Y The problem is that I've already pushed the branch to the repository. Is it safe to delete it from the server and push it under a new name like this ? pu...
I was doing a comparison on speed for GIT and Mercurial. I choose a big project of 9072 files (mainly php files and several images) with a size of 95.1 MB. This is a fake project, and maybe give someone the idea on how to explaing the results I got - it is a wordpress download, unchanged, and copied 12 times inside two folders - one for...
Hi, In our development environment we use Windows, Mac, and Linux. I am having trouble when it comes to the commit -> pull -> push work flow. The problem is end of line characters. If someone makes an edit on Mac and some one else makes an edit on Windows they conflict when pulling. The diff shows the entire file as different because t...
our svn server has a trunk called Dev and Branches live in /Branches/Release/1.0/ /2.0/ /2.3.4/ i cloned it with something like git svn clone -T Dev ... -b Branches ... when I run git branch 2.1 remotes/Release/2.1 i get: fatal: Not a valid object name: 'remotes/Release/2.1'. How do I refer to the...
I have two servers, A and B. A has the repo and can ssh to B. B is a new server I want to have the repo, but cannot ssh to A. I've tried copying the repo, create a remote to push, git clone with a -u... any suggestions? ...
Is there a way, short of actually checking out the parent commit, to determine a submodule's SHA-1 commit ID based on a commit ID in the parent clone? I know I can find the currently associated SHA-1 with 'git submodule'. Here's an example: I have a clone with a single submodule 'foo' that has changed several times in the last month. I ...
I'd like my remote repository to refuse any pushes that contains a file that contains a tab, but only if the file belongs in a certain class (based on the filename). Is that possible? I have looked a bit at the update hook in githooks, and I think that is the correct one. So in short, a push should be rejected if: there is a file of ...