git

Doxygen for a project managed with git ?

I'm working on a C++ and Objective C iPhone Project. I'm using git as my version control system. The codebase has been growing quite a bit, so I would like to add Doxygen to the project. The problem is that I'm not sure about what would be the best approach to do it. I've thought about a couple of options: 1) Create the Doxygen HTML d...

Whats the difference between git reset --mixed and --soft?

I am looking to split a commit up and not sure which reset option to use. I was looking at the page that has a promising title, but I realized I don't really understand what the git index or staging area is and thus the explanations didn't help. Also the use cases for --mixed and --soft look the same to me in that answer (when you want...

Git marks files as deleted on windows when they are locked on checkout

We have just started using Git and GitHub at work on windows and whenever git is unable to access a file on checkout it will mark the files as deleted and lists them as changed but not updated. i.e. error: git checkout-index: unable to create file XXXXX (Permission denied) Checking out files: 100% (876/876), done. D XXXXX Switched...

How to commit after removing a directory from GIT

Several posts talk about removing a file or directory from GIT - but they don't go as far as explaining how to PUSH those changes into the main repository. For example, this works just fine to remove the directory but when I try to PUSH this change to the main Git repo, I am denied: ! [rejected] master -> master (non-fast forwar...

How do I split a Git repository cleanly?

This question took me part of the way, but I'm still missing something. I have a single-user repository (so no problems with rewriting history vs push/pull) where I have developed product code and support code and documents together. After a year-or-so's work, I have finally seen the light, and want to split my repo in two. This is wha...

Why do I get a 401 error in git when pushing changes to github?

I get the following error when trying to push changes to github from the cygwin command promt on windows xp. $ git push Password: [my-password-here] error: The requested URL returned error: 401 while accessing https://[username]:github.com/[username]/[repository-location]/info/refs fatal: HTTP request failed Searches from google seeme...

git repositories

Git is distributed source control system, right. How to connect two developers without a centralized repository. Our team uses Github and if two developers want to work on the same branch it seems that branch needs to be pushed to the remote before they both have access to it...or does it? Can a developer pull from another developers l...

Problem cloning a single SVN Branch via git svn

I have tried the following command on my SVN Repository to clone only a single branch via git. git svn clone http://svn.supose.org/supose/branches/B_0.7.1 but got the the following error message: Initialized empty Git repository in /Users/km/workspace-supose/git/B_0.7.1/.git/ W: Ignoring error from SVN, path probably does not exist:...

git password problem.

I want to set my password on push only not for pull. Is there any way to do that? ...

Do I ever need to run git gc on a bare repo?

man git-gc doesn't have an obvious answer in it, and I haven't had any luck with Google either (although I might have just been using the wrong search terms). I understand that you should occasionally run git gc on a local repository to prune dangling objects and compress history, among other things -- but is a shared bare repository su...

Keeping git remote the same as local repository.

So, i decided to try git as my first vcs. There's actually no serious need(i'm a single developer of the project), just for self-education. I can't find out, how do you properly keep remote up-to-date. Do I really need to rm each file I delete at he local, to delete it from remote? Can it just look which files are missing at local repo a...

Git pull with rebase causing excessive conflicts. How can I fix our workflow?

We have a base system that is customized for each client. The base lives in its own repository, and each client lives in its own repository (originally cloned from base). The goal is to have the ability to add bug fixes/features to base, which can be propagated to clients, on demand. So far the workflow has been as follows: Make comm...

Git Bash on Windows - Where to Store and How to Invoke Bash Scripts

Using Git Bash on Windows, if I create a bash script, where do I put it so that I can access it from the bash shell? Basically, I want to create a bash shell script that does some stuff with files etc. I want to invoke the function from inside the bash with some parameters, and the script will then do its work. I am completely new to ...

How to forbid git commit if there are untracked files?

Sometimes, it makes sense to forbid git commit when there are untracked files, because you should add them either to files to commit or gitignore. And an option like -f to force this commit is also necessary. So is there any option/plugin/etc to do that? Thank you very much. ...

Why does git merge changes automatically when i switch branches?

I'm new to branching in git and I'm a bit confused by the behaviour on swithing branches. Following these steps: git init Initialized empty Git repository in /Users/mads/Desktop/testing/.git/ echo 'hello a' > a.txt echo 'hello b' > b.txt git add *.txt git commit -m "Initial commit" [master (root-commit) 1ab870f] Initial commit 2 files...

Should I use Git for deployment of web apps?

I use Git to track local changes in my PHP web applications, and I was wondering if it would be a good idea to use Git on the server as well, so that I could just use git push to deploy my changes. Would there be any pitfalls with this approach? ...

git-gui: Moving keyboard focus to "changed files"

I'm trying to use my computer with keyboard only, without touching the mouse. In git-gui, how do I move the keyboard focus to the list of changed files, so I can stage them (Ctrl-T) one-by-one? I know I can stage all changed files with Ctrl-I, but it doesn't work for staging newly created files. ...

git delete branches not on local

There's a bunch of branches on one of my git repo's that I got when I forked it on github. I don't really care for my github fork to have these branches. Is there any way that I can push that will delete all the branches on my github repo that are not in my local repo? ...

php cygwin ? how to shell_exec

ok i know this is stupid but atleast im trying :) $result = shell_exec('C:/cygwin/bin/bash.exe /c --login -i git'); var_dump($result); somehow i cant get git command from cygwin, anyone ? Adam Ramadhan edit* it should give usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path] [-p|--paginate|--no-p...

Can git store the mime-type of a file, like SVN does, for browsing html?

I've just pushed my first repo to github but when I browse my html it is served as txt. Is this something that I can set similar to svn's props? Or is this simply a github inadequacy? I can't seem to find anything on git, github or here that helps. ...