I've scoured the web and found a lot about working with git-svn and branches, but nothing that fits my situation. I'm working on a large project, and I work on several of many branches throughout the week. Standard ways of handling git branching wouldn't work for me here... just because of the size of the code involved. It takes about a...
Can I ignore files locally without polluting the global git config for everyone else? I have untracked files that are spam in my git status but I don't want to commit git config changes for every single little random untracked file I have in my local branches. ...
master branch has these files and folders (simplified): C:\Local\TickZoom\Project>ls file.txt name.txt public public branch is tracking a vendor repository and has been subtree merged as public folder in master branch above. public has three folders only (simplified): C:\Local\TickZoom\Project>ls platform providers www...
I backed up a git folder from Linux onto a FAT32 external drive, and copied it back later, and it said fatal: Not a git repository (or any of the parent directories): .git What may have gone wrong? ...
Hi, I was wondering is there a way to prevent 'git push --force' on a repository (only on master branch)? Assume I have remote git repository and do: 'git push' to 'master'. It works. 'git push --force' to 'branch-1'. It works. 'git push --force' to 'master'. It is rejected. Is it even possible? Thanks for any answers and suggestio...
Hi, i'm just testing git to find out if i could use it for my work. I ran into a problem that seems small but could become a real one with the real code. My file looks like: text.txt 1 2 3 4 I've a local branch "branch1" and commited changes in both branch and master. In master i changed the first line in the branch the s...
I have core.editor set to "mate -w". On Leopard, git commit -a starts TextMate. After entering a commit log message, saving (Cmd-S), and quitting (Cmd-Q) TextMate, git would successfully complete the commit operation using the entered commit log message. Since upgrading to Snow Leopard (Mac OS X 10.6.2), the behaviour has changed. After...
I have a git repository in a directory a/b/, and I want to expand this so changes to a/ and subdirectories are stored too. Is there any way to do this simply? ...
I have a server where I set up a Git repository. From my clients, I can execute git pull origin and git push origin and my changes are correctly pushed/pulled to the remote Git server. I also need the ability to checkout the project on the server itself. I did not use init --bare when I set it up, because I explicitly wanted...
I've been learning git and git-p4 and have ended up in a situation where I can't 'git-p4 submit' anymore; patches don't cleanly apply. I can always re-clone the p4 depot and copy my new changes over the top and 'git-p4 submit', but I'd like to maintain my commit history in the new git repository. Given that the old and new repositories...
How do I un-submodule a git submodule (bring all the code back into the core) ? As in how "should" I, as in "Best procedure" ... ...
Subtrees in Git work nicely although some git commands remain to be supported for subtrees. Here's the question: How to make the subtree pull from a different remote branch like "stable" or "integrate"? FYI, we have a subtree "push" working as a script. In fact, it can even push the subtree to the specific branch of our choice o...
Hi I am presenting Git to a 10 man programming team who currently use Visual Source Safe. They need to host their Git server inside the company. Windows or Linux. Directory authentication is Novell eDirectory. They need some granular security on who can push to the central server. From: http://stackoverflow.com/questions/923130...
If you want to move the HEAD to the parent of the current HEAD, that's easy: git reset --hard HEAD^ But is there any simple way to do the exact opposite of this operation, that is, set the head to the current head's first child commit? Right now, I use gitk as a workaround (alt-tab, up-arrow, alt-tab, middle-click), but I would like ...
I would put under version control a big amount of data, i.e. a directory structure (with depth<=5) with hundreds files with size about 500Mb). The things I need is a system that help me: - to detect if an files has been changed - to detect if files were added/removed - to clone the entire repository in another location - to store a ...
I want to build up a git server which provider source management on the project which is related to other project using git. For example, i checkout linux mainstream code, and made some modifications, which are just like new machine ports, on the code. i want to use git to manage this modified code. at the same time, i want to merge the...
Hello. I usually work on a remote server via ssh (screen & vim), where I have a git repository. Sometimes, I'm not on-line so I have separate repository (cloned from my remote) on my laptop. However I can't pull from this repository on remote side because I'm usually behind firewall or I don't have public IP. I've read that I should pus...
I'd like to introduce GIT into my organization, and it would help if I could point to some high profile commercial users of it. I know I could point at Mozilla, Linux kernel, etc, but I'm looking for non-open source users. ...
I'm on a team using Git right now, and we have a pretty good workflow. We have a central repository with two branches, dev and master. We create local branches to work on individual tasks. We merge into dev when they are ready. Then we merge to master when things are ready, and we tag all of our releases. If multiple developers need to c...
Alright, I've trying to set up a TeamCity server the past few hours, but this as really gotten me stuck. I've got everything working, agents are running, plugin is installed, but when I run the build process it instantly crashes with the following log error: Error collecting changes for VCS root '[email protected]:chrisjowen/nLess.git:mast...