git

As of right now, on Windows 7, does Mercurial start up a server much simpler than Git?

On Windows 7, from reading hginit.com, it seems like it is very easy to set up a Mercurial server? mkdir repo cd repo hg init hg serve and that's it? Now http://localhost:8000 is the server. It seems that it is quite a bit harder to set a Git server up, either for Cygwin and mysysGit? Git for sure will make it simpler, maybe just n...

How do I set GIT to use Plink.exe

I'm trying to configure Git to use Plink, now for some reason this option isn't available to me I tried uninstalling and reinstalling Git a hundred times I can't get to this option ...

Using GIT Smart HTTP via IIS

I recently read Scott Chacon's post "Smart HTTP Transport", and I was hoping that it might have become possible via IIS (windows 7) since that post was written. I haven't been able to find anything showing how it can be done, and Apache is not an option in my IIS 7 based environment. So, I'm at a loss (git daemon was foiled for me by a c...

Using git svn with some awkward permissions

Due to some funky permissions on our client's side that we can't change, we have a project whose hierarchy looks something like: projectname/trunk: foo/, bar/, baz/ projectname/branches: branch1/, branch2/ (where branch1 and branch2 each contain foo, bar, and baz.) The thing is, I have no permission to access trunk, so I can't ju...

How can I mark a single file as unresolved after a failed merge in git?

Hi, at the moment I'm merging a very large project and unfortunately I have lots of conflicts. After merging some files I realized that I made merge errors in a specific file and now it is marked as resolved. How can I unresolve it in git in order to merge it again. I tried git reset --hard -- myFile.txt but it doesn't work. Regards,...

Publish git repository to remote http server

I work on a git repository where we build an php community but i need to show it somewhere so I am looking for a way to automatic upload my files to a remote http server when i push to the repository. Thanks /Victor ...

Is it possible to push to 2 or more remote repositories at the same time?

Is it possible to push to 2 or more remote repositories at the same time? I only want to mirror the main repository, where most if not all the pulls will come from. ...

Do git tags get pushed as well?

Since I created my repository it appears that the tags I have been creating are not pushed to the repository. When I do git tag on the local directory all the tags are present, but when I logon to the remote repository and do a git tag, only the first few show up. What could the problem be? ...

Migrating from Subversion to Git how can I find a commit given a revision number?

Migrating from Subversion to Git using svn2git (which internally uses git-svn) I'd like to know how I can find a specific revision commit. It is quite common to have issues tracker to have comments like: "Fixed in r12345". Given this, I'd like to be able, for example, to extract the diff corresponding to r12345. Thanks in advance. Re...

pre-push git hook?

I would like to run a compression script before git push such that anytime a user tries to push changes to a remote repository, it checks for uncommitted changes in the compressible assets, aborts git push, runs git commit, then runs git push again. Is something like that possible using only git hooks? ...

git destroyed my changes

I made a commit of my repository a week ago but never actually pushed it to the remote at github, which I did today. However, in the time from my commit I made many changes to the source. But just the initial commit was pushed to remote and while doing it, it also overwrote my local files. What can I do to get back my current files?? ...

Git history cleanup doesn't seem to have an effect

Hi, i ran the following 2 commands to clean up .pbxuser and .mode1v3 files from my git repository, but afterwards when i e.g. fire up gitx i can still see them in the history. git filter-branch --tree-filter "git rm -rf --cached --ignore-unmatch *.pbxuser" HEAD rm -rf .git/refs/original/ && git reflog expire --all && git gc --aggressiv...

How do I check the date and time of the latest `git pull` that was executed?

How do I check the date and time of the latest git pull that was executed? I frequently need to know when the code changed on a server when something goes wrong. Thanks! Chirag ...

Including external C++ libraries in version control

Possible Duplicate: Storing third-party libraries in source control I'm currently starting a project which is going to be developed on a few different computer and I'm keeping in sync with bzr. In the project I'm using a couple of 3rd party libraries, like SDL. In the past I've just pushed a copy of the compiled library to my ...

Using GIT with Joomla

Hi Guys, We are a web design company going down the road of setting up a revision management system and all the processes around how we are going to use it etc. We mainly develop our websites on a Joomla and what i wanted to know is how other companies manage their repositories when dealing with a CMS. We mainly deal with template bui...

Is there a way to tell git-status to ignore the effects of .gitignore files?

I have configured numerous .gitignore files to filter out many different unwanted files from a set of about 6,000 untracked files. I want to do 'git add .' when I've got my filtered list looking the way I want it. But, then I want to disable the .gitignore filters temporarily to see what got left behind, and make sure there was nothing ...

How to do 'git status' on untracked directory?

I have 6,000 untracked files in one subdirectory and I'm constructing .gitignore files to filter out the unwanted ones. I'm testing my gitignore filters as I go by running 'git status'. However, I have a larger number of untracked other files in a different subdirectory, so 'git status' shows all of those too, which makes it very hard t...

Why GIT reports "fatal: This operation must be run in a work tree" when exporting from bare repo?

Hi, if I export from bare GIT repository using git archive command I get error message: "fatal: This operation must be run in a work tree", altough the export passes properly. So my question is: Is there any issue when exporting from bare repository? I checked the exported archive and it looks alright. Thanks ...

git: correct way to merge/rebase with respect to svn dcommit

I have the following situation (mostly because I didn't really thought it through in the beginning -- or more exactly, I thought it shouldn't be a problem the way I did this but now I am stumbled): ... --- A --- B1 --- ... --- Bn ... --- git-svn Whereby A and git-svn are at the same state (exactly the same files and file content) but...

How to export all changed/added files from Git?

Hi all! I am very new to Git and I have a slight problem. In SVN [this feels like an Only Fools and Horses story by uncle Albert.."during the war..."] when I wanted to update a production site with my latest changes, I'd do a diff in TSVN and export all the changed/added files between two revisions. As you can imagine, it was easy to g...