After working for several weeks with a half dozen different branches and merges, on both my laptop and work and my desktop at home, my history has gotten a bit convoluted. For example, I just did a fetch, then merged master with origin/master. Now, when I do git show-branches, the output looks like this: ! [login] Changed domain name...
Hi there, Trying to set-up a git server on my local dev machine and have been following this website so far but am a little stuck when trying to clone a repository. In git bash, here's my output: $ git clone ssh://[email protected]:4837/ssh/home/Administrator/project1.git Initialized empty Git repository in C:/Git/project1/....
My company is in the middle of converting from CVS over to git. We've been on CVS for a long time, so there is a huge history. Too much to do by hand. Looking at the logs, there is a lot of squashing that could be done. A whole lot. What I would like to do is hook in a script that will compare two adjacent commits. If it returns true, t...
On Windows, can we put different folders in 1 Git or Mercurial (hg) repository? Such as putting c:\ror c:\software projects\ruby c:\js test d:\peter_website all in 1 Git or Mercurial repository called code ? ...
I'm 15 and have just started using source control systems to manage my code a little better, so I'm a little new to this stuff. Right now I have this repository: [a]---[b]---[d]---[f] master \ \ [c]---[e] develop I want to wind up here: [a]---[b]---[d]---[f]---[g] master \ / ...
I created an Android project, added it to my git repo, comitted and pushed my clone to the master. Later I tried checking out the project and Eclipse complained about missing src folders. I checked my repo and the master repo and the src folders are missing (Im sure they were there when I created the project). So can someone explain what...
Subject says it all. I want a git plugin for the Far Orthodox File Manager? ...
Possible Duplicate: Pushing app to heroku error Hello. I am trying to push an app to heroku and I am getting the error detailed here. So I am trying to determine the corrupt objects using git fsck -full but it isn't returning anything. Nothing happens: Ryan@Ryan-PC ~ $ git fsck --full Ryan@Ryan-PC But I get the object...
Hi there, I have a svn repository that I migrated to git using the tool svn2git. Now I would like to push this git layout to a remote repository underneath an existing directory. But, I would like to keep the svn history (tags and branches). For instance: Git remote repository layout: git-repository/dirA git-repository/dirB git-...
Hi, I'm trying to figure how can I use git for multiple environments (dev->test->prod) with code promotion. I read a bit about branching but didn't understand much how can this solve my problem since I must have the ability to run all of the environments concurrently and separately from each other. Will be very thankful for some kind ...
That is, in Mercurial, if Peter cloned from me by hg clone c:\mycode e:\code into his e:\code let's say there is a file code.txt and it contains the text the code is 7 Now, when I change it to the code is 11 and hg commit, then he can get my code using hg pull and hg update. Now his version says the code is 11 But if I decide the ...
Somehow, my global git (msysgit) settings for user.name and user.email (and god knows what else) are set to a recent ex-colleague's details. When I try and change them i get could not commit to u://.gitconfig If I try and create u://.gitconfig through git bash then i get permission denied. C:\Users\<My Username>\ contains no referen...
I used git svn do commit into my svn repository and the comment contained an invalid character. When I try to change the comment as described here I get the following error: svn propedit -r 2958 --revprop svn:log https://svnhost/path/to/repository svn: Valid UTF-8 data (hex: 68 6d 65 6e 66 61 6b 74 6f 72 20 75 6e 64 20 4f 70 74 69 6f 6e...
I have a local repository cloned from a bare remote repository. The following command lists al the remote repository's branches. $ git ls-remote <remote> 74bd3eb190edb39db04f6c0c4dbbb9e1e96bc6db refs/remotes/test 85de54d6ae813c624b9623983e6b0a4948dae0fe refs/remotes/trunk I want to checkout and track that remote's remote branch...
In our project files, if there are binary files, such as .doc, .xls, .jpg, and we choose to not keep their past revisions (just keeping a latest version is ok), is there a way to tell SVN, Git, or Mercurial or some other tool to skip the revisions for these files or for a particular folder? Say, there is a 4MB .doc file that I need to c...
Hi there, I am new to GIT and I have a question that probably wont like. Still, I may. I develop in a proprietary script language with very resumed code in which most configurations are contained inside the code itself. The obvious problem would be the differences in the code itself between test and production environments and that's ...
After invoking git merge --no-commit <commit>, performing a commit will result in a merge commit with two (or more) parents. What command to invoke to create a simple commit instead (without having to re-perform the merge command with the --squash option)? ...
Hi, I'm very new to Git and I've been following this online tutorial for converting my existing SVN repository to a Git repository and am stuck at the final hurdle. http://www.jonmaddox.com/2008/03/05/cleanly-migrate-your-subversion-repository-to-a-git-repository/ On the last step of the tutorial it says to do this: git clone my_blog_...
I'm using Git with WindRiver to manage a project of mine. The code is being managed, however the project files (such as .cproject, .project, .wrmakefile, and .wrproject) are not. However when I switch branches, Git deletes those files spite them being in .gitignore, thereby removing my ability to compile the code without having to revert...
Hi, How can I stash only one file out of multiple files which are on my branch, is there a way to do so ? Thanks. ...