I am a new user in Git world. I used to use Subversion (using TortoiseSVN) and it is pretty easy. I would like to try Git but i got confused by the terms. Is there any documentation/guides that can explain me how to use Git? For example, in Subversion I use checkout; in Git which commands should I use? Any good book about Git that I cou...
I couldn't find anything what is the "right" approach to manage the releases using git. Say, I have master, release-1, release-2 and release-3 branches. Release 1 is already released and I do only bugfixing and released versions tagging on it. Release 2 is going to be released soon and I develop mostly on this branch while on 3 I develop...
When using git submodules, what is the preferred way of doing customizations? Should I... fork the project and track the fork attempt to override the default behavior make the changes locally If none of these makes sense, then what does? ...
When I move a file in git using git-mv the status shows that the file has been renamed and even if I alter some portions it still considers to be almost the same thing (which is good because it lets me follow the history of it). When I copy a file the original file has some history I'd like to associate with the new copy. I have tried...
When I do git status in a subfolder of my repository it includes the status of parent folders also. Is there a way to constrain git-status to just a particular folder? ...
Here's the situation: there are 9 sites, they all share a similar codebase, but there are differences: Type A: 2 of them could be considered "social" sites (events, news, profiles, login) Type B: 3 of them are your regular sites (events module, news, etc) Type C: 4 of them are small "brochure" type sites (just pages and a contact form)...
When git does a commit it rewrites binary files with something similar to "rewrite foobar.bin (76%)" . What is that %? Is it percent changed or percent retained from the older file. I know that git uses a binary delta for files, but I just don't know how much of a rewrite the % represents and it doesn't seem to be in the help page for "g...
I have my dev files at ~/bin/, while my Git repo files at ~/github/myProject/. I always run the following file to copy files from the former location to the latter one: #!/bin/zsh # editors# {{{ cp /Users/Masi/.emacs /Users/Masi/gitHub/MasiDvorak/ cp /Users/Masi/bin/editors/emacs/* /Users/Masi/gitHub/MasiDvorak/editors/emacs/ cp /Use...
The company I work for wants to have monthly releases, and I am trying to convince them to switch to git. I believe the proper git-way to handle this is to have a integration branch for each release (i.e. monthly) and have feature branches off the integration branches for new development and changes. The environment is loaded with interd...
SVN permits the ability to update an old commit message via hook. How can I go about updating my git-svn copy's version of the commit message? The only reference I could find was a bug report requesting this feature about a year ago on debian.org. Is this possible in the current version of Git v1.6.3.*? If not, what's the most intellig...
Hello, I often need to develop stuff on the road, with no internet/network connection. I am only a single developer, so until now I simply had a SVN repository on my machine and did a checkout on my laptop when I went away. Problem: That gives me no Source Control on the road. So I tried out changing to git, which seems to do what I wa...
Please, see Greg's answer. I do not understand Daniel's statement at the thread completely: Why are you manually copying files around at all? Surely you should just add them to the repo, then check out and commit as necessary. I don't see the need to move the files around - that seems to defeat the whole purpose of a loc...
I noticed a moment ago that my .gitconfig -file was public at my repo. It contains my secret tokens. I git-add -u the file and committed. I am not sure whether this command removes the file from the previous commits too. I want to be sure and search the file in my previous commits such that there is no such a file in my history. How c...
I want to remove all files from Git at ~/bin/. I run git rm -r --cached ~/.vim/* # Thanks to Pate in finding --cached! I get fatal: pathspec '.vim/colors' did not match any files This error messsage suggests me to use the following PATHs, since ~/.vim/** does not work ~/.vim/* # I get the error ~/.vim/...
I've got an annotated tag refering to a commit (does it matter if it is annotated?) and no branch refering there. Will the commit be garbage collected after some time? ...
I've seen some books and articles have some really pretty looking graphs of git branches and commits. Is there any tool that can make high-quality printable images of git history? ...
I have my dot files in Github publicly. This means that I have only a few files at my Home shared with others. The disadvantage of sharing, for instance, .bashrc with others is that I need to be careful not adding confidential data to Github. I run git status I get a long list of untracked files. I found out that apparently the o...
I removed my .gitconfig by accident. I added new identies by git add [file] git remote ... [identity addition] I am surprised when Git did not make a .gitconfig file which contain my secret tokens to my Home. Git must have put the secret tokens elsewhere. However, I have not been able to find the location. The reason for that the da...
Github has the following recommendation for ~/.gitconfig [alias] # Is this [-] only a comment in .gitconfig? gb = git branch gba = git branch -a gc = git commit -v gd = git diff | mate gl = git pull gp = git push gst = git status The above commands worked in my old Git. However, they do not work now for some unknown reas...
Assume you have a file which has been committed in your Git repo. You remove the file simply by rm file The removed file remains in your Git repo although you do not have it. My old Git complained me that you cannot commit before you git add/rm the file at a similar situation. I would like to have the same behavior back. How can yo...