This question is similar to this one and this one, but the scenario is slightly more complex. I started out a few years ago with a private svn repository (which I use mainly for shared config files and the like between various machines). I wasn't too careful with the layout of the repository (where branches, go, etc.), so it changed qui...
Hi I am getting the following error when I do a cap deploy, which checks out of a git master repository: Could anyone please help me? Thanks in advance /var/lib/gems/1.8/gems/capistrano-2.5.8/lib/capistrano/configuration/servers.rb:78:in `role_list_from': unknown role `app' (ArgumentError) from /var/lib/gems/1.8/gems/capistrano-2...
This question is based on this thread. My .gitmodules is at my Home [submodule "bin"] path = bin url = git://github.com/masi/bin.git My folder -structure at my Home: ~ |-- [drwxr-xr-x] bin // this is the folder which I make a submodule // it is also a folder where I have a...
I see some one demo git on Mac OS X on line. He can configure his Mac OS X terminal to have multiple color. for example, his prompt is 'wheat' color, his ls directory is purple color. And his 'git diff' output can have ~ 4 colors (pink, light green, red, pale yellow) Can you please tell me how can I configure Mac OS X terminal to achi...
A stupid way I know is: git diff commit-number1 commit-number2 any better way? I mean I want to know the commit1 itself, I don't want to add the commit2 before it as parameter. ...
My team consists of both software developers, business analysts, tech writers, and other non-technical people. We've started storing non-code artifacts (e.g. user manuals, technical documentation, reports, charts) in our Git repository. Our non-technical team members are having some trouble getting used to Git and its command line interf...
I usually do this: git init git add . git commit . And then I realize that it's about to add my nbproject directory, which I want excluded/ignored. Sometimes, I even check in this directory. Had I added it to .git/info/exclude before running git add., everything works fine (it's excluded). So then I modify .git/info/exclude and then...
Or just all the commits that occurred between two dates? In SVN, you could do something like svn diff -r{date}:{date} to do it! I can't seem to find a git equivalent to this. Specifically I'm looking at writing a script to send out daily emails with all the code committed that day and by who. ...
Does anyone know how to get the latest SHA of a given branch FROM OUTSIDE a git repository? If you are inside git repository, it’s you can do: git log origin/branch_X | head -1 However, I am not inside a git repository, and I would like to avoid having to “clone” a repository just to get the latest SHA of a tag/branch. Is there a cleve...
I am attempting to create a svn branch using git-svn. The repository was created with --stdlayout. Unfortunately it generates an error stating the "Source and dest appear not to be in the same repository". The error appears to be the result of it not including the username in the source url. $ git svn branch foo-as-bar -m "Attempt to...
I've recently setup an inhouse git repository server and have it up and running with gitosis installed as the management tool. Read only access is available via the git:// protocol and write access is available via gitosis using ssh public keys. I have a developer that has been granted access to his projects with a public key that was g...
Hi, In a svn working directory, I can make some changes in files in the working directory remove all the changes I made by 'rm all the source files in that directory, but keep my .svn directory) retrieve what the trunk supposed to by using 'svn update' and svn will download all the source back to my working directory. Is there an eq...
Will explain the problem that I'm faces, so that you have a better idea about the situation. We have one project, and about 6 months ago it was branched off. Lets call our branch A, and theirs branch B. In that time branch B has had 100,000 more lines of code added or deleted. We on the other hand have added or changed about 50,000 lin...
I watched the YouTube presentation Tech Talk: Linus Torvalds on git a few weeks ago and one remark seems to be stuck in my mind. In this presentation (around minute 33) Linus says something along the line of "Some people clone a SVN repository, do merging (=headache in SVN) and then push the result back to SVN.". The thought that I ha...
I have a problem where two similar processes are running in parallel within separate clones of the same repository (typically on different computers). Each time a process runs, it fetches the latest tags from the remote and then deduces a unique number based on the tags it sees. E.g. if these tags exist on the remote: 1.0 1.1 1.2 1.3 th...
I want to modify and view github wikis with local editor like Emacs, and Google Code wikis can be checked out just like code. Is there any way to checkout github wikis? Or is there any other git repository provider offers such feature? ...
I am working on a project in a subversion repository with a strict check-in policy which includes: Every commit to the trunk has to be reviewed by another developer and this must be mentioned in the commit message. While working with git-svn I am making many incremental git check-ins that aren't reviewed. Their git commit messages refle...
Hello, I have made several changes to a file and have also added it to the git index. While committing the file I realized that I actually have changes which should go in separate commits with other files. Is there a way to commit only specific parts of this file in Git? Thanks for your help. -- Parag ...
hi I am trying to deploy my app to my server using capistrano I am in a Git Bash and have commited everything and setup deloy.rb file and remote repo on Github. Now when i try and cap command even cap -h from Git bash i get error : sh.exe": cap: command not found I am in the correct dir. It seems Git Bash is not linked to capistran...
Can Git be used the same as sourcesafe, Can I implement it directly into visual studio to check-in/out code and see history? Thanks guys. ...