git

Possible to check out a specific branch using gitosis

I have gitosis setup and working wonderfully using ssh. [email protected]:repository.git works just as expected. Can clone, push, pull, etc. I was wondering if I can use git to pull a specific branching however. [email protected]:repository.git/somebranchname for example didn't know if this was possible and haven't found any examples so I'm ...

Does there exist Git commit policies? E.g. when and what to commit?

Hi, We are going to use Git where I work, and we have some in house programmers, and some external freelance programmers that have never used Source Control Management before. The reason we want to use Git is to be better at communicating with the freelance programmers, and to avoid code from being lost and in general track what they d...

Is there a way to trigger a shell command automatically after repository update/switch?

Hi, I would like to perform a shell command that takes care of cache files and compilation after I have run git pull or svn update (in another project)? ...

Determining if a Git repository contains a particular commit

...

changing git directory to previous one

Hi I have a project directory like /projects/myProject/src/... and my git repository is on /projects/myProject/src directory. But I want to change my main git directory to /projects/myProject(which is the parent of current git directory.) I could just create a new repo on /projects/myProject, but I could lose all of my previous commits. ...

git diff with author filter

I have a series of commits by different authors and I would like to see a git dff output between 2 commits but only considering the commits by one of the authors, something like, something like --author in git log. I am interested in the final summary diff and not the diffs of the individual commits. Is there a git trick for that? ...

Which git tool generated this tree view?

Just wondering which tool generated this git tree view? Thanks. ...

Moving from ClearCase to Git

I'm coming from a ClearCase background where we (simply speaking) had a workflow made up of three steps where the leftmost trunk was unstable, middle trunk is Quality Assurance and the rightmost was stable. i.e.) A A A | | | B C | | /| | C | E | | / D E | / E As you can see the stable trunk contains only the versions that...

Git receive/update hooks and new branches

Hi, I have a problem with the 'update' hook. In the case of a new branch, it gets a 0000000000000000000000000000000000000000 as the 'oldrev'. And I don't know how to handle that case. We have the requirement, that every commit message references a valid Jira issue. So I have installed an "update" hook on our central repository. That ho...

Git : ignore symbolic links

Is it possible to tell Git to ignore symlinks ? I'm working with a mixed Linux / Windows environment and, as you know, symlinks are handled very differently between the two. ...

How can I get coloured patches with git interactive on bash?

I am using git add -i to select patch hunks to add or not. I've learned using git by watching videos at http://gitcast.com. On their videos, I see that the patch output when using git add --interactive are coloured (on OSX?). When I do the same on my system (Linux/Kubuntu/bash), the patches are not colored (the usual shell colours, i.e...

GitHub - Https access

Hi all, I am unable to clone my repository via Https: $ git clone https://github.com/walterjwhite/project.configuration.git Initialized empty Git repository in ./project.configuration/.git/ error: Failed connect to github.com:443; Connection refused while accessing http s://github.com/walterjwhite/project.configuration.git/info/refs f...

Merging commits in git

I have a git repository with hundreds of commits. When I clone it, I get a lot of output like this: ... got ac6d99d2762efe0fcf2b78656e336c25ca8428d5 got ef98d4e93c680384f8174b95e431627b29a56580 got 4d6e1231e0f6265458a8e6ab47a44bfcd357486b got 7e3d3a2fc10d0dfe00e87e8eed4a3fc1efa5eaed walk b43c1e0062b72d3ab416ad209e94e13a6c71815d ... Thi...

Can git tell me what the current managed base path is

Hi all, Assuming I am somewhere in a repository managed by git, which is based at some path. I.e.: /home/whatever/username/MyRepository/a/b/c where everything under /home/whatever/username/MyRepository is under git control. Is there a git command I can run from some arbitrary location under the managed path which returns the base...

Use git-svn to also control directory versioning.

I want to use git-svn to sync my local computer with my company's remote svn repository. I used to do that, but had to stop because git did not put directories under revision control. The problem is that when I added a new directory git worked just fine, but when I removed a dir the directory would still exist in the svn repository, cau...

Resolving conflicts in git version control

I've got a big problem but I bet it's easy to solve. I'm developing a website together with a friend using GiT for versioning control. We've just modified different parts of the same CSS file and then commited, then he pushed his commit. We're both using master branches in local and remote repository for we don't know how to deal with it...

git clone with different file permissions

On our server are three (in reality: thousands of) text files stored in a bare git repository: A.txt, B.txt, C.txt. User "admin" should view/edit them all. User "Foo" should view/edit "A.txt" and "B.txt" but he is not allowed to see the content of "C.txt". User "guest" should only be allowed to view/edit "A.txt". All three users sho...

How can I tell git (or some other dvcs) to track a file privately?

My use case starts from something a lot like this; a team uses a central repository (in my case it is subversion, but I believe if it were git the issue would be the same), and some of the files are member-private (Django local settings files, IDE private project preferences etc). While the private file should remain private -- that is, ...

Git add only non-whitespace changes

I have my text editor to automatically trim trailing whitespace upon saving a file, and I am contributing to an OpenSource project that has severe problems with trailing whitespace. Every time I try to submit a patch I must first ignore all whitespace-only changes by hand, to choose only the relevant information. Not only that, but when...

In a git merge, how do you just replace your version with the version git says there is a conflict with?

I have two files: A and B. If I have been working on A and a partner is working on B, I want to merge files A and B. B is already committed. Let's say my partner already made the changes I was working on, so I just want to replace my A file with their B file - no merge needed. How do I resolve the conflict with git? Thanks! ...