git

Git or Mercurial usage in Java projects

Just wondering if any of you are using Git or Mercurial for your Java projects, or is Subversion still the most popular choice? I've been looking at github.com and bitbucket.org lately, but because the repositories might be private, I can't get a good indication of actual usage. ...

Unable to track files in long PATHs by Git

Git says to use git add to add untracked files to my repo. I have run unsuccessfully git add shells/zsh/keyboard_configs/ git add shells/zsh/references/ git add shells/zsh/keyboard_configs/* git add shells/zsh/references/* git add shells/zsh/keyboard_configs/*<TAB> git add shells/zsh/references/*<TAB> git add . I still get that ...

Is [---] a comment in .gitconfig?

This question is based on this thread. Is [---] a comment in Git such that I can use only % tool=opendiff % once in my .gitconfig? ...

How does Git decide where to save secret tokens exactly?

This question is based on this thread. I am interested in how Git decides where to save secret tokens exactly when you run git remote add github... In other words, I would like to know which file affects this behavior. I know that it can be changed, since that info was stored to my old .gitconfig, while it is now at .git/. This may ...

Are there any good graphical git and hg/Mercurial clients on Mac OS X?

I'm searching for compelling git and Mercurial clients on Mac OS X. The most clients I've found so far were less compelling as I expected. Some of the clients are programmed even in ruby or tcl/tk, which IMO aren't good OSX citizens in regard of integration in the OS. I've clients in mind similar to Versions.app or Cornetstone which are...

Best practice for managing project variants in Git?

I have to develop two Django projects which share 90% of the same code, but have some variations in several applications, templates and within the model itself. I'm using Git for distributed source-control. My requirements are that : common code for both projects is developed in one place (Project1's development environment) periodic...

fatal: unable to run 'git-svn'

I've never seen this one before. I'm creating a development on a new Mac by cloning several svn repositories to local git repositories. Several pulled just fine, but one is being stubborn. They're all being pulled from the same svn server and there are no differences that I know of. I've tried to clone this one particular repository 4 ti...

Unable to track files in deep directories by Git

Problem: to add files at ./shells/smallApps/* to Git at ./.git/ when I do not have the files at ./.git/info/exclude nor at any .gitignore -files. This question is based on this tread where the problem is not solved completely. I run $git status ...

How can I commit only part of a file in git

When I commit changes to a file in git, how can I commit only some of the changes? Example: commit only 15 lines out of 30 changed lines. ...

Git: How do I ignore matching directories in a sub directory?

I have a project with the following structure: /. /src /project1 /bin /obj /project2 /bin /obj /tools /tool1 /bin What can I add to my .git/info/exclude to ignore all bin/obj directories under "src"? I don't want to explicitly specify each project name. ...

git: undo all working dir changes including new files

How to delete all changes from working directory including new untracked files. I know that git checkout -f does that, but it doesn't delete new untracked files created since last commit. Does anybody have an idea how to do that? ...

How to stop git via ssh on windows from resolving the wrong path?

I have a windows 2003 box with an ssh server setup. I have msysgit (git version 1.6.2) installed both locally and on the server. The server has the following absolute path to my repos: e:\vc\git\myrepo.git when a user logs in he/she will be put in the following working directory: e:\vc\git\ When running the following cmd on my de...

Hudson checkout gets stuck at 'git fetch'

I'm using git version 1.6.2.2.1669.g7eaf8 with Hudson Git plugin 0.7.3 on Hudson 1.314 When I trigger a build, Hudson does a git fetch, but it never returns. I had one stuck there for 14 days before I killed it. The console output - it just sits here for days on end: Started by user anonymous Checkout:workspace / C:\hudso...

What's the purpose of git-mv?

From what I understand, Git doesn't really need to track file rename/move/copy operations, so what's the real purpose of git mv? The man page isn't specially descriptive... Is it obsolete? Is it an internal command, not meant to be used by regular users? ...

Should Git Repo's be at the Solution Level or Project Level in Visual Studio

If I have a C# solution with multiple projects in it, what would be better, to have the Git repo created in the solution folder, or in each individual project folder? Multiple developers will be working on the projects. What are your experiences with this? ...

Repo command with no results

Hello, I have installed repo and git on my PC. I am trying to get the latest Android source by using the following commands: repo init -u git://android.git.kernel.org/platform/manifest.git The command succeeds but I am not able to see .repo directory created. repo sync This command also succeeds and the program shows the details of obj...

Why does git keep deleting my folder?

I have a folder in my repository called 'activity'. It keeps getting strangely deleted from the repository, and isn't seen as an untracked file. In github, it is rendered as a folder with a green arrow, and the text '→ f32111b' next to it. This has happened several times now, and only with this one folder. I've already checked .gitign...

How would I extract a single file (or changes to a file) from a git stash?

I'd like to know if it is possible to extract a single file or diff of a file from a git stash without popping the stash changeset off. Might anyone be able to provide some suggestions/ideas about this? ...

How to skip "Loose Object" popup when running 'git gui'

When I run 'git gui' I get a popup that says This repository currently has approximately 1500 loose objects. It then suggests compressing the database. I've done this before, and it reduces the loose objects to about 250, but that doesn't suppress the popup. Compressing again doesn't change the number of loose objects. Our curr...

Continuous integration workflow idea

Hi, In the software development environment where I work we have a group of developers all working in the same (Java) codebase (currently using SVN). I notice that people want to commit often what they have constructed without 'breaking the build'. So just for that reason I'm looking at tools like Git and Mercurial that make branching a...