Git clean branch to save only my changes and changes from master -

-

i have branch, did changes, i'd mistaken , create wrong branch, have many different changes don't want have in it. how can clean have changes i've done , changes master branch?

you can create new branch master , cherry-pick changes have made new branch.

find commit hashes every commit want save. then:

git checkout master git checkout -b <new branch name> git cherry-pick <commit hash> # every commit want save

cherry-picking single commits can tedious, when have lot of them. since git 1.7.2+ cherry-pick can handle commit ranges.

git cherry-pick <first commit save>^..<last commit save>

as eol pointed out in comments, cherry-pick applies each patch in turn , waits user commit it, if there conflicts. in case, resolve conflicts , git cherry-pick --continue automatically move next commit. or use git cherry-pick --abort abort whole operation.

now inspect current branch. if worked well, can delete previous messed-up branch:

git branch -d <old messed branch name>

see git cherry-pick manual page further details.

edit: included info git cherry-pick --continue, eol mentioned in comments.

update

you mentioned want cherry-pick commit created. can done little bash script:

author_name="your git author name" start_commit="earliest commit hash cherry-pick" end_commit="latest commit hash cherry-pick"  git rev-list --reverse --topo-order "$start_commit^..$end_commit" | while read rev   commit_author_name=`git log --pretty=format:"%an%n" -n 1 $rev`   if [[ $commit_author_name == *"$author_name"* ]];     git cherry-pick $rev || break   fi done

Popular posts from this blog

How to calculate SNR of signals in MATLAB? -

-
i've encountered simple, yet fundamental problem on calculating snr: there several signals : s1 = original , pure clean signal without noise. n1 = white gaussian noise going added s1. s2 = s1 + n1 (the noisy signal before performing noise-reduction algorithm) s3 = noise-reduced signal (after performing noise reduction algorithm) n2 = s3 - s1 (the amount of noise after performing noise-reduction algorithm) now want compare snr before , after performing noise-reduction algorithm. which signals should consider snr_before!? s1/n1 or s2/n1 ? which signals should consider snr_after!? s3/n1 or s3/n2 ? which commands or functions should use in matlab in order compute snr_before , snr_after? thanks billion putting time on helping me. what know calculating snr before : snrbeforenoise = mean( signal .^ 2 ) / mean( noise .^ 2 ); and snr after : residual_noise = signal - noise_reduced_signal; snr_after = mean( signal .^ 2 ) / mean( residual_noise .^ 2
Read more

c# - Attempting to upload to FTP: System.Net.WebException: System error -

-
i have api takes in xml , uploads files based on information in xml. uploads on schedule (also xml), , have tested surrounding , know works. i getting error 40% of time on first file attempt upload in each time cycle (time cycle = 45 minutes files, 30 minutes others). here code upload: try { loggerftp.log("uploading file: " + filename, false); // create request. ftpwebrequest request = (ftpwebrequest)webrequest.create(appsettingsftp.ftpurl + @"/" + filename); request.method = webrequestmethods.ftp.uploadfile; request.timeout = 6000000; //set 100 minutes //request.timeout = -1; //set infinite // add login credentials. request.credentials = new networkcredential(appsettingsftp.ftplogin, appsettingsftp.ftppassword); // grab file contents. streamreader sourcestream = new streamreader(appsettingsftp.uploadfiledirectory + filename); byte[] filecontents = encoding.utf8.getbytes(sourcestream.readtoend()); sourcest
Read more

ios - UISlider customization: how to properly add shadow to custom knob image -

-
Image
i need place custom knob image shadow uislider. far have image of 38x38, of there region defines shadow of knob. now while using image, when slide knob extreme ends actual knob not able cover end points, hence end points visible under transparent region of knob image this code using customize uislider uiimage *slidebtimg = [uiimage imagenamed:sliderknobimg]; [self.ratingslider setthumbimage:slidebtimg forstate:uicontrolstatenormal]; [self.ratingslider setthumbimage:slidebtimg forstate:uicontrolstatehighlighted]; how can implement custom knob shadow beneath it, covering end points?? look inside uislider.h , there methods let customize slider knob , track needed. (ios 2.0 , above) // lets subclass lay out track , thumb needed - (cgrect)minimumvalueimagerectforbounds:(cgrect)bounds; - (cgrect)maximumvalueimagerectforbounds:(cgrect)bounds; - (cgrect)trackrectforbounds:(cgrect)bounds; - (cgrect)thumbrectforbounds:(cgrect)bounds trackrect:(cgrect)rect value:
Read more