I currently have the following keybinding in my .vimrc: nnoremap <Leader>gs :Gstatus<Enter><C-n> I'm using vim-fugitive plugin here. The intention is to pull up the Git status window and then move the cursor to the next file (<C-n>). It works, except the <C-n> part, and it seems to be because Vim executes it before the status window lo...
Hi, I am trying to figure out the right workflow for this situation: On the shared repo, we have these branches: -master -feature The feature branch is a shared branch, since many developers are working on a new feature together. They are actively pushing their changes to the feature branch. I'm trying to avoid 'conflict hell' for ...
Recently, I've started experimenting with Mercurial, due to the fact that it always attracted it because of its simplicity and "just works" principle. Or at least, that's how others always described it. They also usually described it as "practically the same as git with just a few minor changes you won't notice" - only for me to discove...
I use git all the time for my solo missions but I tend to just work the master. Should I try forking even if it's just me? ...
This is related to another question I recently asked about storing a non-bare repository in Dropbox for easy movement between computers, so it may be helpful to read that question for background. The gist is that the fileMode keeps reporting a diff for some number of files. I can't find a way to reproduce it consistently, but it happens...
I remember 2 events in SVN history: TortoiseSVN got usable and VisualSVN got usable. The result of the first: "We will never ever want to use SVN with command line". The result of the second: "We will never ever use SVN & MSVS without VisualSVN" please understand this correct - we do use SVN command line if we need something that can n...
Are there any good alternatives for Github Enterprise Edition for a private network? have about 30 dev's and a ton of projects. Moving away from Subversion as well so any methods to keep the history as well would be nice. Maybe archive in git somehow and start a fresh branch going forward. Project and Developer News Feeds Source Code B...
I'm not finding my answer in the online git lit. It is clear that git checkout is destructive in that it will throw away local modifications but does it also destroy commits by changing the structure of the tree? For example, say I have three commits a <-- b <-- c | HEAD + stash c and HEAD is currently at c an...
I've been asked this question about distributed source control in general by someone who's familiar with Team Foundation Server. Is it possible to use a DVCS such as Git or Mercurial for source control and comply with standards such as ISO 9001 or CMMI? What requirements do ISO 9001 and CMMI place on what source control tools should an...
Hello everybody. I have a question I can't solve out by myself. To put it simply, I'm wondering if there's a way to track a file in a branch while keeping it secret so that it's not added into other branches when this branch is merged into another one. To make it clearer, say you have a branch b1. Then you add an new file f and you tra...
Our University provides web hosting to campus departments on servers we manage. Installing open-source third-party programs requires modifying file permissions and code in the program before it will run. (We're using suEXEC, if you're familiar.) We currently offer WordPress via an installer script. The user uploads the newest stable rel...
I am writing a script that requires checking whether a particular commit is a Merge/Revert commit or not, and I am wondering if there is a git trick for that. What I came up with so far (and I definitely don't want to depend on the commit message here) is to check HASH^2 and see if I don't get an error, is there a better way? ...
I'd like to set up some rules in my .gitignore whereby any directory or file with a name containing "_nogit" will be ignored. Examples: ../videos_nogit/... bigvideo_nogit.mp4 assets/_nogit/bigvideos... Thanks-- ...
Is there a way to search through commit headers in command line? ...
I am getting the followoing error when I try to do a deploy via a "deploy" user account. 1782001..ae10d1b master -> master ** transaction: start * executing `deploy:update_code' updating the cached checkout on all servers executing locally: "git ls-remote [email protected]:username/app_name.git master" * executing "if [ -d ...
I recently installed my git in my shared hosting now I want to install gitweb but I don't know how to install and configure it. Do you have any process to share on gitweb installation? ...
I am exactly halfway down this page: http://help.github.com/msysgit-key-setup/ I've just generated my first ever RSA keypair and I now want to add that key to my Github account. Thing is, I don't see how to access the public key that I'm supposed to enter into Github's 'key' field. Entering cd id_rsa.pub and id_rsa.pub into Git Bash do...
Hi everyone, I am a newbie to Git/GitHub and would like to know how to generate a public key(to be used in GitHub) using Git Bash. The command below generates the error sh.exe": syntax error near unexpected token '(' I am using windows xp. $ ssh-keygen -t rsa -C "[email protected]" Generating public/private rsa key pair. Enter file ...
I understand the idea of running git fetch <remote>, because the remote branches are then available with git checkout <remote>/<branch>. But how does it work if I just run git fetch path/to/other/repo How can I checkout the corresponding branches? Note that the operation runs silently (even with --verbose), and that no new branch is ...
When i am usig git over samba share on windows i get an error when i want to commit a file via git_extentions or tortoiseGIT. The error is: error: unable to write sha1 filename .git/objects/b4/e819f886bf31b67c42249a0eff8e8b16cf7622: Permission denied When i add the file via the ubuntu server and commit the file it works fine. I am also w...