git merge - Convince git blame that one branch is more relevant to history than another -


i use git blame secondary form of documentation. it's useful check why commit made, , when , whom.

but history of particular line gets lost. situations might happen:

  • a change made, reverted.

  • someone re-indents file , commits it. later standard indentation restored , committed.

  • someone copies files new branch/repo no history. still have original history in branch, want merge new branch.

in these cases git blame show latest changes file, not useful. e.g. "restore indentation" or "revert commit #123" or "initial commit: files".

is there way hint git blame more interested in older history new one?

here situation:

... - - b - c
  • commit has annotations lines in file.
  • commit b reindented entire file.
  • commit c (possibly revert) restores file how in commit a.

i wondering if perform magical git merge priority parent:

        .-------.        /         \ ... - - b - c - d
  • commit d tells git priority history git blame follow.

another possibility find acceptable:

            e - f                   \ ... - - b - c - d
  • commit e new empty branch.
  • commit f adds file of concern.
  • commit d merges 2 histories, making f priority history.

i hoping make permanently part of history. not interested in passing options git blame when searching history.

both of scenarios theoretically created, neither produce output desire, "change" still detected part of commit c. , both require substantial amounts of manual work there. (i'd have test happens in baseless merge, second scenario might delete other files in repo merge.)

remember git stores snapshots of code , things filenames, folders, lines, commit messages, etc. more metadata describe content inside git's brain.

git blame nature cares content of current blob , code originated. not see change between merged branch , code , keep looking commit different report.

if want eliminate whitespace changes vanilla blame give output want, best option interactive rebase squash commits under initial commit's message , author, of course assumes haven't pushed code remote , again requires manual intervention.

i know said didn't want pass options blame, easiest , consistent options pass -w flag , blame more or less use case describes, , tell commit of last substantive (non-whitespace) change line.


Comments

Post a Comment

Popular posts from this blog

angular - Ionic slides - dynamically add slides before and after -

hi i'm using ngfor create set of 3 slides while starting in middle i'm guaranteed able slide left or right on start. when slide right can simple listen reachedend , push slide array i'm looping. but have problem adding slide beginning. if same above , use e.g. array.unshift() or spread add item beginning, view think it's on position 0 , snaps view new slide. the code below work animates slide change index 1. slide = [0,1,2] //example loop slidechanged(event) { if(this.slides.isbeginning()){ this.slide = [this.slide[0]-1, ...this.slide]; this.slides.update(); this.slides.slideto(1) } } <ion-slides [initialslide]="1" (ionslidedidchange)="slidechanged($event)"> <ion-slide *ngfor="let item of slide"> <h1>slide {{item}}</h1> </ion-slide> </ion-slides> any appreciated! you can using ionslidenextend , ionslideprevend events slides . please
Read more

minify - Minimizing css files -

i want know how css files can minimized. currently, using external sites css minifier compress css files. however, after removing whitespaces, comments, etc, file sizes reduced 10-15%. how frameworks bootstrap manage make minimized versions kilobytes. as example, css is: body { background-color: #ff0; } the reduction goes 28 bytes 22 bytes other css files have lot more characters still smaller this. actually minifying code means it's remove thing code white space characters new line characters comments block delimiters it reduces amount of code has transferred on web , speed site load fastly.but unreadable format.
Read more

Add a dynamic header in angular 2 http provider -

i have http interceptor built via tutorial https://scotch.io/@kashyapmukkamala/using-http-interceptor-with-angular2 the problem need have dynamic header changes automatically once changes 'mode' in app. service able tell interceptor change header, or have interceptor pull header (which string)from service each request. able throwing away patch method, call http.patch('new header string') set header string. call in service controls 'mode' setting. wondering if there way interceptor pull recent value service each request or if can add method http provider via interceptor? i've tried call service in interceptor each request returns undefined. because creating new instance of service or copying value before service fired , loaded/changed data. i don't want pass header string every http provider call because defeats purpose of having interceptor, id able set once changes or have provider fetch service before makes request. tl;dr : need add autom
Read more