Is there a tool that can migrate Starteam to svn or git or any other modern/decent source control system? I'm thinking of something along the lines of how git-svn works; allowing you to use git to pull from an svn repository. Something that can import a StarTeam repository and convert it to an svn repository, but also keep pulling from...
I have a local topic branch that's tracking a remote branch. For the sake of argument, say the commit histories look like this: A--B--C--O1--O2--O3 (origin/phobos) \ L1--L2--L3 (phobos) Having looked at the relative commit histories, I now want to discard all the changes to the local phobos branch and get it back to be...
I am using git to develop against a project hosted in subversion, using git-svn: git svn clone svn://project/ My general workflow has been to repeatedly edit-and-commit on the master branch, then commit to the svn repository via: git stash git svn dcommit git stash apply One of the local modifications that 'stash' command is preser...
Suppose my terminal screen is 40 lines high. Suppose I type in "clear"; Suppose the output if git grep is only 1- lines. Now, the desired output I want is to have the first 10 lines of my console be the output of git grep. Instead, git grep fills in a bunch of blank lines and makes my output the bottom ten lines of the screen the out...
I don't mean what is it or how do you use it. I mean, rather literally, what have I marked as --assume-unchanged? Is there any way to find out what I've tucked away using that option? I've dug through the .git/ directory and don't see anything that looks like what I'd expect, but it must be somewhere. I've forgotten what I marked this wa...
I'm trying to connect and fetching source from a ssh server with using putty, plink and git from command line. When connecting with putty or gitextension/tortoisegit/etc. there is no trouble. I can login or fetch/upload files. Set variables and Executed plink GIT_SSH={somePath}\plink.exe plink -i key.ppk -ssh ssh://user@server:port ...
I am using git and working on master branch. This branch has a file called app.js . I have an experiment branch in which I made a bunch of changes and tons of commit. Now I want to bring all the changes done only to app.js from experiment to master branch. How do I do that? Once again I do not want a merge. I just want to bring all th...
git log -n 20 --pretty=oneline I am telling git that I need to see only last 20 commits. I hate to hit Q to get rid of END. Is there a way out so that I don't have to hit q. ...
I suppose I'd better explain my situation: I'm in the process of developing some software, and I'm at the stage where I'd like to split my project into two branches which differ in features. It so happens that this application is an Android application which I will be deploying on the Market, which has the constraint that every app must...
I have two repositories. I started a project locally on my development machine, later cloned it to a testing environment on the customers server. I mimic the environment on the customers server, but for that I need to have some files (and some lines in some other files) to be only present on my local machine, but they must not appear on ...
I'm sort of stuck with adding symlinks to my app on the server. I currently have the following in .gitignore: /non-public/system/uploads/* I basically don't want Git to store the contents of the upload directory. So far so good. On my server, inside my deploy.rb, I have the following: namespace :customs do task :symlink, :roles =...
I am a Git newbee with UNIX SCCS and Microsoft Visual SourceSafe experience. I’ve created a repository, looked at what Git created, and can’t find the files anywhere under the .git tree. So, how do I know my files are safely stored in Git? ...
I am a Git newbee with UNIX SCCS and Microsoft Visual SourceSafe experience. In SCCS, each file has a version (I%), which is made of Release (%R), Level (L%), Branch (%B), and Sequence (S%). %I is equal to R%.%L.B%.%S, okay? These are referred to as ID Keywords. The purpose is you insert these ID Keywords in the source code before chec...
I am a Git newbee with UNIX SCCS and Microsoft Visual SourceSafe experience. I’m just learning Git and it seems to have a huge and painful learning curve. I’ve already seen Git blow away all the data files I hadn’t committed, which concerns me. (How a utility can delete data files without warning is beyond me). Linus Torvalds, in his vi...
Hey guys, This is my first time making an app with any kind of version control and the idea of it sounds awesome. I'm just getting started and using some tutorials to figure it out. I created my app.... rails example Then started up git..... git init and now I'd like to make an .gitignore file which most tutorials are using mat...
The file that's mystifying me is v5/employer/controllers/_employer.php. In the first image, you'll see that Brian changed the file in a commit on 14:55:47 called "time to commit stuff". But that commit's only child (second image), a merge operation Brian did at 14:56:45, does not show any changes to that file. But it's different! ...
The situation: master is at X; quickfix1 is at X + 2 commits then i started working on quickfix2, but by accident took quickfix1 as the source branch to copy, not the master. Now quickfix2 is at X + 2 commits + 2 relevant commits Not I want to have a branch with quickfix2, but without the 2 commits that belong to quickfix1. I tried to...
Before anybody shoots me down for this - I have already checked every appropriate thread and still not found a solution to my problem. I have Hudson with git plugin installed on windows server (not my choice) and Hudson runs as a service. Git/bin is on the path. However I cannot clone the repository. Here is a shortened display of the c...
Hi, I worked locally on a git repository. It has various branches like a dev branch, some branch for experimental changes and so on. And of course a master branch. I want to setup a public (well, indeed it's a lan thing, better say "shared") repository to only contain the master branch. How to export that branch so that i can copy it ...
I want to git clone an svn repository except for one folder in the root folder of svn. How do I do it? I could do git svn clone svnrepo/dir/sb-dir/ if I needed only sb-dir but I need all folders (and files) within the dir except the design folder ...