git-add

Unable to Git-add with force

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...

Why does git show "dev/null" in status after interactive add of renamed file?

I get an unexpected appearance of "dev/null" in my git status output after interactively adding a patch for a file that was renamed. I'm wondering if this is expected and there is some good reason for this behavior, or if this could be a bug. Below is a simple illustration of how to reproduce this. In my real-world scenario, it's a bit ...

git: How do I recursively add all files in a directory subtree that match a glob pattern?

I have several .screen files inside /xxx/documentation and its subdirectories that are already tracked by Git. After modifying many of these screen files, I run git add documentation/\\*.screen—as indicated by the first example in git-add's documentation—to stage these files, but the command fails: fatal: pathspec 'documentation/\*.scr...

splitting up a git commit into phases: how to manually intervene?

I have a source file where 2 features have been added. In order to allow cherry-picking, I'd like to commit that in 2 phases: one for each feature. Until now, in similar situations, using git add -p served me well, to commit one feature while leaving the local files in their final stage. However, I now have the problem that git add -p w...

Untangle two lines with `git add -p`

I've got a file with the following changes: # Manual hunk edit mode -- see bottom for a quick guide @@ -280,6 +281,7 @@ if( foo ) { bla(); - test( true ); + removeThis(); + test( false ); } else How can I commit the change for test() only, and avoid committing removeThis() ? Each time I try to edit the hunk manually ...

git add --interactive "Your edited hunk does not apply"

I'm trying to use git add --interactive to selectively add some changes to my index, but I continually receive the "Your edited hunk does not apply. Edit again..." message. I get this message even if I choose the [e]dit option, and immediately save/close my editor. In other words, without editing the hunk at all, the patch doesn't appl...

git-svn problem with git add --patch resulting in conflicts

Basically when i want to commit two separate changes in the same file that resulted from an git add --patch <file> operation, git svn rebase later on throws 1-2 conflicts upon comitting the second change when using git add for the second change. so i'm basically doing this (i'm on master branch and have fetched the svn repository): git...

git stash and edited hunks

I totally love git add -p and git stash but I occasionally have the following problem, which is reproduced by the following sequence of commands: git add -p my_file: then I edit a hunk manually (using e) because the splitting that git suggests does not suit me git stash --keep-index: then I do some testing, and if the tests pass I do n...