git-add

I have a very frustrating error when trying to manually edit hunks while using the command: git add -p I have already looked through many of the existing questions on this site, including this one , and this one . I am at the point where I try to manually edit a hunk, make no changes to the file opened by git for manual editing, and still getting the error "Your edited hunk does not apply". I thought this might have to do with CRLF vs. LF EOL characters. I am editing in Notepad++, and I can see that all of my line endings are CRLF. I naively tried to change all the line endings to LF, but to

I compile binaries for OS X using GitHub' s electron environment and want to add the output to a git repository. I tried git add . error: readlink("sulu.app/Contents/Frameworks/Electron Framework.framework/Electron Framework"): Function not implemented error: unable to index file sulu.app/Contents/Frameworks/Electron Framework.framework/Electron Framework fatal: adding files failed Any idea to work around this? Windows command mklink /H "Link_File_Path" "Target_File_Path" Use above command to create a hard link for all your output files. That will work. I did similar stuff for git hooks. Refer

I get git-status at ~/bin: # Untracked files: # (use "git add <file>..." to include in what will be committed) # # screen/dev/ I run git add --force screen/dev/ I get the same git-status as before. I add each file in the folder independently, but I get the same git-status. There is no .git in screen/dev/. The folder seems not to be a sumbodule. How can you add a folder and its content with force to my git at ~/bin? You should not need ' --force ' or ' -f ' option: see git add : -f --force : Allow adding otherwise ignored files. In your case, you may not want to add all files, included ignored

As you can see from this excerpt, there is a "!" before the git command. What's the point? [alias] commitx = !git add . && git commit - https://stackoverflow.com/a/8956546/1354543 I understand aliases and what the command itself is doing, but not the point of the "!" before the git command. The ! means "run the following as commands to the shell", so in this case the alias git commitx expands to the equivalent of running git add . && git commit (which is a terrible terrible idea) An important aspect of ! not covered by the accepted answer is that for the shell command, the working directory is

git add --patch provides a great interface for reviewing unstaged changes and then staging only the ones that are wanted in the next commit. Great, except for one thing: there is no obvious way to choose which diff view to use. In particular, I would like to be able to configure git add --patch to present diffs to me the same way that git diff --word-diff does. How can I achieve that? (N.B. neither --word-diff nor --word-diff --color is exactly the same as --color-words , and so this question (and its answer ) are different to this question and its answers. However, that question's answers are

I'm new at git so please bear with me. Say i have a file under version control that includes sensitive data. Sure enough, I put that file in my .gitignore file, so it doesn't get pushed to the repo. The problem now is somewhere in my project i have a line like #include <sensitivedata> or whatever your language of choice is. The problem is whenever somebody clones from that repo, that file is missing and he gets a fatal error when trying to build / compile the solution. So, instead of pushing the file I'm actually working on I want to push some dummy file with the same name instead, where I