How do you list your commits along with their SHA1 values in git?
How do you list your commits along with their SHA1 values in git? ...
git
Best practices for cross platform git config?
Context A number of my application user configuration files are kept in a git repository for easy sharing across multiple machines and multiple platforms. Amongst these configuration files is .gitconfig which contains the following settings for handling the carriage return linefeed characters [core] autocrlf = true safecrlf = f...
distributing git configuration with the code
Hello all, I'm trying to standardise the platform for the developers, one of my needs would be to commit the .git/config so that everybody have the same CRLF config without forgetting to set it by hand. Thanks, Nicolas. ...
How to include a parent Spring project (using Git submodule)?
I'm currently developing multiple web applications using Spring. I'm using Maven for building and Git for version control. At the moment I'm trying to find a way to split development of some things used by all webapps, e.g. I have some helper classes that are the same for all projects. The problem is, I don't want to use only classes, bu...
splitting up a git commit into phases: how to manually intervene?
I have a source file where 2 features have been added. In order to allow cherry-picking, I'd like to commit that in 2 phases: one for each feature. Until now, in similar situations, using git add -p served me well, to commit one feature while leaving the local files in their final stage. However, I now have the problem that git add -p w...
How to tell Git to always pull the master branch?
Find find git docs very cryptic regarding this issue. I want to do a simple thing, but it seems doing it is not simple at all. I have the following situation: $ git remote -v origin git://192.168.0.49/mnt/repos stick /mnt/titanium/podaci/repos I can use git pull to fetch and merge from origin, and that works fine: $ git pull Alr...
Migrating svn repository to another git repository(as a part of it)
I'm trying to migrating a svn repository to another git repository. I read all the documents as well. But they are talking about how to migrate a svn repository to a NEW git repostory. What I want to do is let the svn repository as a part of the old git repository with the svn log. I have a git repository and a svn repository Files in ...
git-svn guestion about creating local branches
Is there a way to create a local branch, or modify an existing local branch, in such a way that it cannot be dcommit'ed to the svn repo? Here's a description of the scenario. git checkout -b local.farBranch remotes/farBranch git checkout -b patched.local.farBranch git merge local.patches <work on patched branch && test> <do not commit...
Sparse checkout in Git 1.7.0?
With the new sparse checkout feature in Git 1.7.0, is it possible to just get the contents of a subdirectory like how you can in SVN? I found this example, but it preserves the full directory structure. Imagine that I just wanted the contents of the 'perl' directory, without an actual directory named 'perl'. -- EDIT -- Example: My git...
on GIT, pushing merges with merges
I have 3 branches: A, B, C Usualy when i am to update my Origin I go to Master, merge the branch I've finished, and push. Now, I had branch A, work, done. Went to branch B, merged A, work, done. Went to branch C, merged B, work, done. If i go to master and merge C and push to origin, can I delete already A, B and C ? ...
How Should I Handle a Plugins Repo Using Git?
Hi everyone, I have a bit of a dvcs design question: I have a project that I am hosting on github. I also have several plugins that I have written for the project, but that I don't want to include in the core code, because they are optional plugins. In svn, I just created an additional dir that contained all of the plugins. Users could...
Question about using 'git svn'
Hi, I am using git to get my Webkit repository by following this: https://trac.webkit.org/wiki/UsingGitWithWebKit So i did git clone git://git.webkit.org/WebKit.git WebKit I have been upgrading my repository using "git pull" My Question is can I do ' git svn rebase' in my repository? Or I can only do that if I create my repository...
How do I do an initial push to a remote repository with Git?
I've read through countless tutorials and I keep coming up short. Here's what I've got: -- I'm running RubyMine on my Windows desktop -- I've installed Git on my WebFaction hosting account per their instructions -- Git appears to be working fine on both machines Here's what I'm doing: 1. On server: a. mkdir project b...
Git Merge subdirectory to branch to root directory of master
I have a branch that has the content of the master branch as a subdirectory. Now I made some changes to this subdirectory. Ideally I want to be able to merge these changes back into the master branch. Branch layout: index.html subdirectory > a.txt > b.txt Master layout a.txt b.txt How would I go about doing this? Is it even a ...
capistrano-git configuration is changing hosts
My provider (dreamhost) changed servers on me. My cap deploy:migrations command is now giving me grief. It uses the new servername everywhere except when it asks for my password. Instead of [email protected] It uses [email protected] A sanitized version of the outputs is below....
Version control for large php/mysql web application
Hello everybody! I am working on a large php/mysql application, and I am getting to the point that i have to use some kind of version control. I have read a few articles on GIT, but i can't seen to figure out what the best way is to go about this. I have a dedicated server that runs CENTOS with PLESK. And i mainly develop on my local ma...
How to bridge git to ClearCase?
I've recently used git svn and enjoyed it very much. Now I'm starting a new project at a different customer. At that site the SCM of choice is ClearCase. I haven't found a baked equivalent of git svn for ClearCase. Is there anybody who has tried to use git locally as a front-end to ClearCase using some tricks, configuration or scripting ...
Git hooks for metadata storage/retrieval
One of git's unavoidable quirks is its inability to store and retrieve metadata about a file. For example, on the mac, labels are stored with "extended attributes" (accessible with xattr), and any checkout/reset/merge/pull command will erase those attributes if the file is affected by the checkout. I've looked around to see if someone h...
Git - "Your branch is ahead of 'origin/master' by 3 commits."
hi all I'm getting this info in git >git status # On branch master # Your branch is ahead of 'origin/master' by 3 commits. # nothing to commit (working directory clean) And, when i try to push, i get this: fatal: failed to write object error: unpack failed: unpacker exited with error code To ssh:<my repository> ! [remote rejected] ...
Git branch deletion
In GIT, what does DELETION of a branch mean? Will it be gone from the repository? Or will it still be navigable to via git branch What I really want to do is mark a branch as DEAD END, i.e. the branch is so far from master, that nobody should use it as a starting point, though there were some good ideas down that branch, so we'd like ...