Git diff with line numbers (Git log with line numbers) -


when git diff or git log -p, how line numbers of source file(s) inlined output?

i tried man git-diff | grep "line numbers" , tried googling got nothing quickly.

you can't human-readable line numbers git diff

there aren't options line-numbers displayed vertically on side git diff.

unified-diff format

that information available in (c)hunk headers each change in diff though, it's in unified-diff format:

@@ -start,count +start,count @@

the original state of file represented -, , new state represented + (they don't mean additions , deletions in hunk header. start represents starting line number of each version of file, , count represents how many lines included, starting start point.

example

diff --git a/osx/.gitconfig b/osx/.gitconfig index 4fd8f04..fcd220c 100644 --- a/osx/.gitconfig +++ b/osx/.gitconfig @@ -11,7 +11,7 @@ <== here!  [color "branch"]         upstream = cyan  [color "diff"] -       meta = yellow +       meta = cyan         plain = white dim         old = red bold         new = green bold

the hunk header

@@ -11,7 +11,7 @@

says previous version of file starts @ line 11, , includes 7 lines:

11  [color "branch"] 12         upstream = cyan 13  [color "diff"] 14 -       meta = yellow 14 +       meta = cyan 15         plain = white dim 16         old = red bold 17         new = green bold

while next version of file starts @ line 11, , includes 7 lines.

unified-diff format isn't human consumption

as can tell, unified-diff format doesn't make easy figure out line numbers (at least if you're not machine). if want line numbers can read, you'll need use diffing tool display them you.

additional reading


Comments

Post a Comment

Popular posts from this blog

javascript - RequestAnimationFrame not working when exiting fullscreen switching space on Safari -

request animation frame stops working when exiting fullscreen clicking on original space's safari window. fine if fullscreen mode canceled escape key or calling cancelfullscreen(). steps reproduce: open https://dl.dropboxusercontent.com/u/769042/prezi/safari-fullscreen.html click "draw raf", kittie appears click "fullscreen", go fullscreen click "draw raf", kittie appears go space original safari was, showing "click exit fullscreen mode", click anywhere, out fullscreen click "draw raf", nothing happens what handling click calling: window.requestanimationframe(draw); which draws on canvas context: function draw() { ctx.drawimage(img, math.random()*500|0, math.random()*400|0, 100, 100); } i checked .hidden , .visibilitystate, updated correctly. tested on osx 10.9.3, safari 7.0.4 (9537.76.4). has workaround/solution other switching old settimeout? this sounds webkit bug 88940 : using reque
Read more

Python ctypes access violation with const pointer arguments -

i have api i'm trying wrap in python (2.7.6 on win7) code using ctypes. here's api: client_dllfunc bool clientapi search_exporttoclipcopy(clienthsearch handle, int channel, lpctstr filename, const time_t& from, const time_t& to, const bool* cameras, int length, bool usepassword, lpctstr password, bool includetextin = false, bool excludeplayer = false); the issue i'm having cameras argument; , i've had issue other const pointer arguments well. here's how i'm wrapping api: def search_exporttoclipcopy(self, hsearch, csearch, filename, tfrom, tto, cameras, length, usepassword, password, includetextin=true, excludeplayer=false): exporttoclipcopy = self.sdkdll.search_exporttoclipcopy exporttoclipcopy.argtypes = [c_int, c_int, c_wchar_p, c_long, c_long, pointer(c_bool), c_int, c_bool, c_wchar_p, c_bool, c_bool] exporttoclipcopy.restype = c_bool exporttoclipcopy(hsearch, csearch, filename, tfrom, tto, cameras, length, usepassword, pass
Read more