git

Commit in git only if tests pass

I've recently started using git, and also begun unit testing (using Python's unittest module). I'd like to run my tests each time I commit, and only commit if they pass. I'm guessing I need to use pre-commit in /hooks, and I've managed to make it run the tests, but I can't seem to find a way to stop the commit if they tests fail. I'm ru...

Git through digest proxy authentication

I want to do "git clone" through a proxy server. The issue is my proxy server uses digest authentication. So i can't find neither in git documentation, nor help that someone that already made. I dig through google search and i can't find any helpful results. Thxs. ...

help with git command to push files when did not make branch

I was working on my Rails project which is checked into Git. I read tutorials and they said for everytime you start to change something, check out a branch. However, accidently I made some changes but did not check out a branch. What should I do now? What commands can I run so that Git takes my new changes and push them on my reposit...

How do I merge a binary file?

I have a binary file in my_branch, and when I need to make changes to it, git will of course not merge it. So what I do now is: git checkout my_branch # make a change to gui.bin mv gui.bin ~/ git commit -a mv ~/gui.bin . git commit -a # git rebase to 1 commit git checkout master git merge my_branch But is there an easier way? ...

Create branch from current working tree and reset to HEAD

Hey there, I currently work on a feature that turns out to be bigger than expected, so it's propably the best to create a branch to work on it. So I need to create a new branch from my current working directory and reset the master branch to the current HEAD so that some fixes to the production environment can be done. Somehow this sou...

how to use git to make commits from two different machines

I am new with git. I have a project on git. I would like someone else to get the repository, make changes and check their changes back into the repository. Before that I would like to do this from a different machine that I have what is the procedure to do this? should the repository be cloned on the machine? ...

Git repository from one machine to another

So I have a git repository that i pulled at one point and that repository resides on a server. I don't have access to the original repository that I pulled it from. How do i get the code from the existing server to another computer? EDIT 1: So here's what it looks like: COMPUTER A: The git repository that I originally checked out fr...

Git-svn operation philosophy?

How does git-svn operate? I have access to an svn repository at work but I'm going to start to work with a distributed team and I'd like to start to fire up git use on this project (as a pilot). ...

Can't find a decent git gui for windows. Anyone know of one?

I'm running win7 and need a good git client with a GUI. I like bash but it feels clunky in windows. the GUI that comes with the windows package at git's website is missing a lot of stuff too. I'm considering switching to Ubuntu and using Gedit + git instead. What should I do? stay in windows and use Aptana or Komodo with another git clie...

repo sync problem

i am a beginner to android development... i was trying to get the sources for the 1.6 release... but the repo sync operation keeps hanging... i am pasting the last part of the message i get on the terminal here: Fetching projects: 19% (32/164) Initializing project platform/external/freetype ... remote: Counting objects: 970, done. remo...

Browse orphaned commits in Git

Hi, My git repository has somehow gone wonky - I loaded up msysgit this morning and instead of the branch name being shown after the current directory, it says "((ref: re...))", 'git status' reports everything as a new file, 'git log' and 'git reflog' tell me "fatal: bad default revision 'HEAD'", and so on. Doing 'git reflog --all' or '...

Default config settings for a new git repository?

When I create a new git repository, some configurations settings are automatically added to .git/config. Where can I change these default settings? ...

How can we use version control in a shared work environment?

Currently our team (web devs, one designer and one copywriter) all work on separate workstations but do our changes on the same dev environment (we all mount the same shared drive), it's a marketing site and not a web application, so no builds or deployments, we just push changes to the live site once they are done, but I think it's impo...

Git-Svn: Retain commit timestamp after dcommit

I've been using Git & Git-Svn for a year or so now and somehow just noticed that, after a dcommit, my commit history is preserved, but the timestamps aren't. In other words, each git commit entry is retained, but in Svn each commit has the same timestamp (more or less). It's not unusual for me to work remotely for a day or so at a time,...

Deploy changed files using Git

I’ve come to Git from SVN. Formerly in order to update some production site I compared revisions from production one to HEAD using TortoiseSVN, exported changed/added files into a temporary directory and after that uploaded them onto production server. Is it possible to reproduce the same using Git (TortoiseGit)? ...

(abusing?) git workflow

Coming from Sourcesafe, I have primarely been using git as a major undo feature. I tend to work in the master branch, code happily away for some time, commit here and there and move on. While I'm coding my brains out, I sometimes wish to drop what I'm doing right now and start working on another feature. I know I can start another br...

Git: how to analyze code that has a multi-file history?

I'm about to move a ton of files around in an existing project. Before I do this, I'd like to have a firm grasp on some techniques used to analyze code that has a multi-file history. How can I use git to ask: "where did this line of code come from?" when the content has moved through multiple files in it's life time? I know git doesn't...

git rollback single file

I'm currently in branch 'foo'. I just ran git merge master. Only problem is there was a certain file in foo that I wanted to keep. Is there a way to get it back but keep all the other changes from merge master? ...

What's the best way to change the working tree to a specific commit before bisecting?

My usual workflow when starting a git bisect session is: git bisect start # start a bisect session git bisect bad # I noticed that the current state is broken Now, often I know that things worked in the past, but I don't know yet which version was good, so I usually want to revert my working tree to an older state,...

Calculating total lines added/deleted after a merge?

I recently took a branch with a lot of commits and merged it back into my master branch. If I needed to go back and see how many lines were added or deleted because of that merge, how would I go about doing that? ...