github - How to create a clean theme branch in git which only has one commit (and no pulls from upstream) -

-

forking prezto

i forked sorin-ionescu/prezto (upstream) github github account (nasenatmer/prezto) (origin), cloned locally , started configuring it, adding files, while committing , pushing changes github repo.

configuring local repo

among other things, modified prompt theme want give project , i'd create pull request`. learning github "using pull requests" , tutorial on gun.io, tried create theme branches, commit changes can forward them pull requests on github. however, in meantime, there updates in upstream.

so had following commit history: original checkout - - many "private commits" - - - pull upstream changes

creating theme repo

so in order create theme repo, created branch @ earliest clone upstream called pristine , won't customise myself. pulled upstream bring pristine up-to-date.

from point branched off prompt_jakob_setup (that's name of prompt file) , committed file it.

the problem of many commits

now, if go github start pull request theme branch, see two commits today: pulling in upstream , prompt commit.

i don't think maintainer accept such unprofessional pull request?

the question

what right way create clean themed branch has 1 commit want push upstream?

if don't want upstream merges want git rebase upstream master.

you can git pull --rebase upstream master. fetch before rebase sure date.

this move commits after commits happened on upstream repo. , not show commit message concerned about. if want change current repo want git reset --hard commit (undoing merge upstream) , proceed git rebase. if have pushed these changes own repo on github may have git push --force overwrite history. (i recommend against doing since repo, should ok.)


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