This python script is the best I have come up with so far. I just hacked it together and on a cursory first couple uses, seems to be acting correctly, but I can't help but feel there is an easier way to do this or even something built in (though I have searched and searched). Thanks for the help. #!/usr/bin/env python ...
So imagine that I have a local repository that I've cloned from some origin. At the time of my intial clone, the origin had four branches: featureA, featureB, featureC and master. If I push changes to the origin that delete the featureA branch I'd expect to see something about it being deleted the next time I issue: $ git pull orig...
I'm trying to switch from a windows environment to Linux. I'm primarily PHP developer, but I do know quite a bit about other languages such as CSS, XHTML and Javascript. I need a way of editing my files locally because I work in a git repository and need to commit my saves. On windows I used Aptana and PDT. I'd save my files, upload via ...
The common mistake I make in git is not check on which branch I am commit changes to a wrong branch (on branch B, thinking I'm on A, commiting a change for feature A) How do I get back, and commit the edits to the proper branch? ...
Occasionally I dropped a DVD-rip into a website project, then carelessly git commit -a -m ..., and, zap, the repo was bloated by 2.2 gigs. Next time I made some edits, deleted the video file, and commited everything, but the compressed file is still there in the repository, in history. I know I can start branches from those commits and ...
I'd like to convert a repository from Subversion to Mercurial, but when I initially set up the repository, I did it in the laziest way possible. Over time, the structure continued to morph and deteriorate (it's 5 years old at this point). Nevertheless, I'd like to preserve as much history as possible, even if I have to get dirty and ma...
I've dug through the interwebs all I can, and I can't for the lack of me find any way of easily stashing or branching locally with perforce. I know of the git wrapper for perforce, but it really doesn't seem too well developed or reliable from everything I've read about it. ...
For instance, suppose I have Repository 1 and Repository 2. Repository 1 has a file /a/b/c/d. Would it be possible for me to import this file into Repository 2 as /e/f/g/h? The reason being that I want to pull in changes from an experimental branch from a different git repository. I tried merging everything together, but there were a...
We use svn, and I use git-svn to maintain sanity. At one point, our svn server decided to return a 403 for a certain folder. It happened to everybody, not just me. Because of this, I'm unable to do a git-svn rebase. I see this error: Index mismatch: 164adbb93408bed4ff0bdbcbf07bdfb2c49ed0ce != 64443edc6089f7f737e51cf8ea5ff3680c95a7e9 r...
I'm trying to follow these instructions on installing gitosis: http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way and these: http:// www.webtop.com.au/installing-git-and-gitosis-on-fedora-10 And at the point where I need to clone the gitosis-admin.git repository from the server I'm setting up, I am receivi...
I trying to get the source of android using repo and git. Everytime I do a repo sync, the terminal indicates that it is fetching projects but it will freeze at that particular line for hours. I am guessing that my network is behind a firewall. Which port should I open? or What should I do? ...
I have never used SN or Git but I really want to start. I have doen some reasearch over the past couple months but it seems really confusing to me. I just now watched a tutorial video for using git with github.com and it seems like something I can do. I have some questions though. 1) The reason I liked the git is because it seems r...
Is there a way in git to have a 'description' for branches? While I try to use descriptive names, working for a while on a single branch sometimes dampens my memory of why I made some of the other topic branches. I try to use descriptive names for the branches but I think a 'description' (short note about the purpose of the branch) would...
Hi all. I've got a bare repository on our development server here, and a clone of that elsewhere on the drive. I've written a small post-update script as follows: #!/bin/sh echo Updating vhosts.git at `date` >> /root/vhosts.log cd /usr/local/www echo Updating `pwd` vhosts as `whoami` OLD_GIT_DIR=$GIT_DIR GIT_DIR=.git git pull origin ma...
I'd like to apply revision control - using git - to my WordPress-based website development. Based on my concerns below, how do I go about? Concern 1: Pushing "granular changes" In this specific case, it is hard to mimic the webserver environment locally. Therefore, I would like to push changes very often. Could I push changes on a "sub...
I want to cherry pick from one branch to another, but they diverged strongly. How can I get list of commits that modified a given part of the file? ...
I started working on a little Python script for FTP recently. To start off with, I had server, login and password details for an FTP site hardwired in the script, but this didn't matter because I was only working on it locally. I then had the genius idea of putting the project on github. I realised my mistake soon after, and replaced th...
I know this has come up before, but there was little in the way of day to day personal experiences in the posts I saw. Only a couple of responses. I'd love to hear from people that use git-p4, or have used git "under the covers" in a Perforce repo, or preferably both. And for those people who just use git underneath another version contr...
I am new to shell scripting and can't figure this out. If you are unfamiliar, the command git branch returns something like * develop master , where the asterisk marks the currently checked out branch. When I run the following in the terminal: git branch | grep "*" I get: * develop as expected. However, when I run test=$(gi...
My project I am working on is version controlled under SVN. I had to do a large number of refactorings. For this purpose I took my workspace and created a new git repository. Afterwards I made the refactorings and committed to my local git repository as often as possible, made branches etc.. Meanwhile someone made commits to the SVN. No...