What does the “@@…@@” meta line with at signs in svn diff or git diff mean?

by

Those are called (c)hunk headers and contain the range information.

They are surrounded by double at signs @@. They are of the format:

@@ -l,s +l,s @@

where l is the starting line number and s is the number of lines the change (c)hunk applies to for each respective file. The - indicates the original file and the + indicates the new (modified) file. Note that it not only shows affected lines, but also context lines.

The -1,5 is in the original file (indicated by the -). It shows that that first line is the start and 5 affected / context lines

The +1,9 is in the new (modified) file (indicated by the +) and again first line is the start and 9 affected / context lines.

More details here: http://en.wikipedia.org/wiki/Diff#Unified_format

More Related Contents:

  1. How can I see the changes in a Git commit?
  2. How to grep (search) committed code in the Git history
  3. How do I view ‘git diff’ output with my preferred diff tool/ viewer?
  4. How to compare a local Git branch with its remote branch
  5. Can I make git recognize a UTF-16 file as text?
  6. Merging: Hg/Git vs. SVN
  7. What is `git diff –patience` for?
  8. Can I use git diff on untracked files?
  9. How to see the changes between two commits without commits in-between?
  10. Filter git diff by type of change
  11. use Winmerge inside of Git to file diff
  12. Git keyword substitution like those in Subversion?
  13. Where does the excerpt in the git diff hunk header come from?
  14. What does “@@ -1 +1 @@” mean in Git’s diff output?
  15. Should I add the Visual Studio 2015 .vs folder to source control?
  16. Git: How can I find a commit that most closely matches a directory?
  17. diff returning entire file for identical files
  18. Git Diff of same files in two directories always result in “renamed”
  19. How resolve multiple conflicts with “git mergetool” without having to close the editor between files?
  20. Viewing all `git diffs` with vimdiff
  21. View differences of branches with meld?
  22. How to attribute a single commit to multiple developers?
  23. Getting started with Version Control System
  24. Exclude file from “git diff”
  25. How to apply `git diff` patch without Git installed?
  26. ‘git status’ shows changed files, but ‘git diff’ doesn’t
  27. Diffing between two entire directories/projects in hg or git?
  28. How to perform a three-way diff in Git without merging?
  29. Using git diff, how can I get added and modified lines numbers?
  30. How to make ‘git diff’ ignore comments

Leave a Comment