git

GIT: is a tag unique per commit?

If you can use a tag only once (unique by commit), what do I do with 7 commits in tag "Version 7.3"? I hate that GIT doesn't make revision numbers (like SVN :)). I guess a subquestion would be: What would be a best practice to 'control' version numbers (ex revisions, so I want to save major.minor in every commit and DEFINITELY in every ...

How to in Git, clone a remote (GitHub) repository from a specifed date.

I'm trying to clone a git repository from a certain date. Even if this is not possible. Is it possible to clone the git repository and then roll it back to a certain date? Example: my repository has been updated since May 2010, but I'd like to get the version from June 5th. I'd like to run the following command: git clone git@github...

git checkout certain files despite conflict

I frequently find myself wanting to checkout only certain files in a tree but cant because I have modified them locally and dont want the hassle of trying to figure out merge (I dont want to merge anything - I just want the git version of certain files). So how can I force a checkout of, for example, "db-backup*" where these files are s...

New to git -- how do I get changes from cloned repo into original repo?

This is probably quite a newb question, but I can't seem to figure it out. Here's what I did... On the server (via ssh): Created a site on a dedicated server Created a git repo there (git init I think?) Added and committed everything At my office: Cloned the repo on my development machine Pulled everything Made some changes to lo...

How to view diff of a forked github project

I have forked a project on github and need to have a set of changes I made since I forked, in diff format. If you wonder - I've forked Apache httpd and I'm changing some code in core. Currently I'm not commiting any changes, running git diff, and use its output as a patch against vanilla httpd sources in an RPM building process. It is, ...

How to use git as source control provider for management studio

Hi, Can we use GIT as the source control for sql management studio? ...

Tracking a large project that has switched from svn to git.

I'm tracking a project that has recently moved from svn to git. I've got the most recent svn code and want to start using the code from git. Is there a way to do this that doesn't involve re-downloading quite a large codebase over a slow connection? Essentially, I want to be able to say "start from here (old svn code) and just get the ch...

Strategy for extracting messages of most useful commits to changelog

The needs for this question is to have a changelog for managers/customers that: does include "Let users have additional addresses" does not include "Fixed the bug where addresses were overwritten due to X" avoid having to look through complete log history to find the most important commits (most often backwards incompatible) for e...

What's the best way to setup git when having common code that should be used in several repositories?

Hi Everyone, I'm working as a .NET developer in a development team where we are using kanban for our software development process. We are currently using team foundation server for source control and having a branch-by-feature strategy to ensure that we allways have releasable code. Since there is some "limitations" in Team Foundatio...

Git - Authentification failed

I'm completely new at git, and having had prior knowledge with putty decided to set it up to use that. At first it came up with an error I traced back (using google) to me not connecting via plink to the server to cache it. I was able to connect via plink to the git repository I need to clone, but doing the "git clone x y" comes up wit...

Git is stressing me out. Anything else?

I don't understand git. I have no experience with command line stuff. I've spent a week trying to figure it out and it's stressing me out big time and holding us back. I'm simply building out the front end HTML and CSS. Do I have to use git? Seems like everyone is these days but I just don't "get" it at all. We used to use SVN and tort...

Trouble connecting to gitosis server

I followed this guide to setup git and gitosos: http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way. I'm stuck at this part: git clone git@YOUR_SERVER_HOSTNAME:gitosis-admin.git I'm using Git Extensions with putty and my SSH server is running on a non-standard port. It says how to set the port for linux but ...

git clone -- submodule

I'm fairly new to git and just trying to put a submodule into a repo. The problem is that when I clone the parent repo, the submodule folder is entirely empty. Is there any way to make it so that 'git clone parent' actually puts data in the submodule folder? example: http://github.com/cwolves/sequelize/tree/master/lib/ nodejs-mysql...

Howto remove unused objects from a git repsitory?

I accidentally added, committed and pushed a huge binary file with my very latest commit to a Git repository. How can I make Git remove the object(s) that was/were created for that commit so my .git directory shrinks to a sane size again? Edit: Thanks for your answers; I tried several solutions. None worked. For example the one from Gi...

Where does git store information about the origin of a repository

I have a repository that I cloned from someplace a few months back and I'd really like to know where it came from. A 'git pull' returns successfully and tells me everything is up to date, but I'd really like to know where its checking. I've looked in the usual suspects in the .git folder, but can't see anything obvious. Anyone know wher...

Git for Mac OS X 10.4

Where should I download a free Git client for Mac OS X 10.4 (Tiger)? ...

Git: list only "untracked" files (also, custom commands)

Is there a way to use a command like git ls-files to show only untracked files? The reason I'm asking is because I use the following command to process all deleted files: git ls-files -d | xargs git rm I'd like something similar for untracked files: git some-command --some-options | xargs git add I was able to find the -o option t...

git revert merge - neither mainline looks correct

I am trying to revert a faulty merge, but the revert changes from both commands do not look right. This is how I made the merge commit: # merge master into branch: git checkout branch git merge master # resolve conflicts git commit git push Now I want to revert that merge with: git log b2e commit b2e... Merge: de9... cf4... git ...

demystify using GIT or any simple source control with visual studio

Lord all I ask is for some simple software that will maintain versions of my files and revert to ones I want. Personally, I felt like just using a nice backup tool I have to just zip up a copy of my folder on another drive when I want. But they said I Have to use SOME source versioning. Already posted the problem I had with SVN. Now it...

Gitting with a team

I'm developing an application and my friend wanted to join the development. So I created a git repository on assembla.com , performed a push and invited him to work with me. My question is about the working proccess. We both use git bash on msysgit. I don't have problems with commit and push, the problem is with getting my friend change...