git-diff

Trying to adapt the answers from Want to exclude file from "git diff" for the --stat flag and failing - the accepted answer (create a driver) seems unix only (redirect to /bin/true, whatever this means) plus it creates a driver and assigns it to the file kind of permanently, while I am looking for a switch to temporarily disable the diff for a file (or rather some files). The scripting solution : git diff `git status -s |grep -v ^\ D |grep -v file/to/exclude.txt |cut -b4-` actually calls git status and edits its output - while what I want is to instruct git diff itself to ignore some files

I wonder if it's possible to add a certain amount of unparsed content to a diff file (unified) that is ignored as a comment. One good use of this would be having git diffs augmented with important information such as from which branch is that diff from (especially when using the --full-index option, which merely displays the blob references). The unified diff starts with two line header: --- from-file from-file-modification-time +++ to-file to-file-modification-time Anything before this header is ignored, so you can add any comment here, for example: This may be some useful description of this

how can I list newly created(added) files between two branches? I can list all files that have been changed with: git diff --color --name-only branch1..branch2 But that also contains files, that just changed their content, not necessarily new files. Is there some git command for this, or do I have to checkout each branch and compare the files, e.g. with bash? Thanks. Filip michas Just replace --name-only with --name-status . This way git will show if the file is added, deleted or just modified. If you are only interested in the new (=added) files you can simply grep for ^A : git diff --name

I have a file which has been already added to my local repository. I've modified it in the working tree, so git status shows me the file as modified. I would like to know what is the file content kept in the index before I stage the file. I can think of two ways of doing that: revert a patch generated by git diff , and apply it on the file in the working tree use git checkout-index , point to a temporary file and read the content from there Is there an easier way? grawity Use the : prefix to access objects in the current index (staged but not yet commited). git show :file See the gitrevisions

Git offers these 4 diff algorithms, but without any further information what are their differences. What are the advantages of each of this algorithms? Is there some comparison of various cases where the algorithms perform differently? jelle foks I think there are multiple algorithms supported because none of the algorithms are clearly the best choice in all cases. The differences are in readability of the patch output and processing time needed to generate the patch. Summarizing, this is what I understand the differences are: Myers: The original algorithm as implemented in xdiff ( http://www

I've been using git for some years now and always wondered why git diff prefixes the names of modified files with a/ and b/. I expected to eventually stumble upon a use-case where it is useful, but until now it was always annoying and never helpful. What is it good for? Why is this enabled by default? In which situations is it useful? As mentioned in the diff man page , a/ et b/ represent the prefix to differentiate source and destination. Actually, you have the options: --no-prefix Do not show any source or destination prefix. --src-prefix=<prefix> Show the given source prefix instead of "a/"

My question is rather simple, though I have had no luck finding an answer. I'd like to remove the leading plus/minus symbols from each line in git diff . Before you ask why I wish to do this, allow me to outline my reasons: Lines that are exactly 80 chars will overflow by a single character, which just looks plain awkward The coloring is enough for me to distinguish between additions/deletions I'd prefer to keep my Terminal's window width at 80 chars (as opposed to an arbitrary 81 chars) to maintain consistency with everything else I do in my Terminal (outside of git ) Is there some config