So I'm having issues getting this to work properly. I chug along doing a few things in my git repo, commit, git-p4 rebase and git-p4 submit. The problem pops up on the submit, with the following errors: common/data/testsheet2.xls has type 100755, expected 100644 I get this all over with several different files. Perforce is set to have al...
I have a project versioned with Git that I'd like to make open source, but it has some private information in it that is specific to the environment in which it was originally used. I'm going to change the information in question to load from a config file which is not included in the repository. I realize I should have done this in the ...
I have a branch that I'd like to move into a separate Git repository, and ideally keep that branch's history in the process. So far I've been looking at git filter-branch, but I can't make out whether it can do what I want to do. How do I extract a Git branch out into its own repository? ...
Hello all, I'm a newbie in git world, i want to ask how to solve my workflow problem, basically I have 2 computer, one in office and one in home, and I'm also have a vps working as my git shared repository. When I work at office, I have unfinished code, and I want to continue my work at home, so usually I'll commit first at office and pu...
Hi all I created a custom project skeleton as a start for my django projects, hosted on a public repo at github. Id like to use this as root folder for my new, public and privates projects, also hosted @github. The problem is i cannot use this one as a submodule because as fas ar i know i cannot add submodules inside another submodule...
Possible Duplicate: Which files in a Visual C# Studio project dont need to be versioned? when creating a repository, what do you include in the repository, should folders like Resharper, Debug and Bin folder be included? if not, is it possible to exclude files/folders from the unstaged changes check? ...
Hi to all! My colleagues and I are thinking of giving git a try and see if we can easily move to it. We work on a Windows-only environment. On our own machines we already have git set up with mingw32 and SmartGit as gui client. Is there an easy approach based more on the concept of sharing folders than on the concept of "hosting server...
Just trying to enchance my knowledge of git and use to tips and tricks, I updated my .bashrc file as suggested in Tip PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ ' but to my surprise now my git branch command is not working and even if I remove it from .bashrc than also it is not working for me. Also every time, I use my command prompt I g...
I just want to see the files that were committed in the last commit exactly as I saw the list when I did git commit. Unfortunately searching for git "last commit" log in Google gets me nowhere. And git diff HEAD^..HEAD is not what I need, of course, since it spews the guts of the change too. ...
In my deploy.rb for Capistriano I have the following: set :branch, "2.3.5" but Capistriano insists on checkout out deploy. Any ideas why and/or how to fix it? I'm using git as the SCM: set :application, "Example" set :repository, "[email protected]:example/example.git" set :scm, :git set :deploy_to, "/var/www/example.com/" set :branch,...
I'm working with Git pushing changes to a repository shared over HTTP / WebDAV, and Git prompts for a password for every operation that accesses the HTTP remote. Is there any way to make Git cache the password / have the remote server not prompt me? The remote webserver should be an Apache and could possibly be reconfigured if necessary...
I have a one git project with a file structure like this: Project_A/files... I have another git project with a file structure like this: Project_B/ Project_A/files... files... Now I want to merge Project A into Project B and continue using Project B as the sole repository. I tried using the subtree merge, b...
Here's a git repository on github: git://github.com/Fudge/gltail.git What's the simplest way to check out a read-only copy using the git command line tool? update: Here's a suggestion to the githubbers: Do something similar to google code, which automatically displays a message such as: Use this command to anonymously check out...
I am open to using tools and strategies around git. Essentially, we want to expose a subset of the branches on a repository to Read or Read/Write for a set of users. Another subset of branches would not even be known to those users. ...
Hi. I want to do a Diff between a locally commited change and between the SVN commited last change. i.e. HEAD and what is on SVN Master trunk. what would be the suitable command? Cheers ...
There is an internal SVN repository on which many changes have been made. This contains not only the project of interest, but also many other folders. There is an external git repository, on which many changes have now been applied. What is the best way to merge these 2 sets of changes. I was thinking, take the diff of the git HEAD an...
Hello there! I just switched to CMake. And yet found it very useful and realized some simple apps and libs. Somewhere I read that it's possible to query git to checkout repositories from within cmake scripts. I'd like to check for the existence of a package with my Find(package).cmake If it doesn't exist i'd like to initiate a checkout...
I set up a remote repository and I can push new changes to it, but I cannot fetch from it, I always get the (rather cryptic) error message: fatal: Refusing to fetch into current branch refs/heads/master of non-bare repository fatal: The remote end hung up unexpectedly What does it mean? What should I do to enable fetching? (Note that...
Hi, We are using mercurial-hg and git, and are wondering if there is a way to create documentations from the existing code and newly check-ed in code. Is there any plugin that we can hook into mercurial-hg/git that generates documentations? Thanks ...
How I can see only the files that diverge between two branches? ...