Git reset branch to remote/master keeping logs -


i think know answer i'll ask anyhow.

i work on fork branching. have upstream , origin latter fork.

then create branches origin/new-feature (from on nf). nothing exotic. :)

so after experimenting while in nf , having pushed experiments origin work i've done it's not gonna fly.

reset local , origin with

$ git checkout upstream-master $ git pull $ git checkout nf $ git reset --hard upstream/master $ git push --force

now question. there way keep history of old commits in same branch?

if i'd liked keep them have created new branch origin/nf-abandoned before going reset above.

yes, git rebase for. operate on checked-out branch (the source) , branch given on command line (the target) , replay history of source point diverges target onto target new commits, retaining author timestamp commit messages.

$ git checkout origin/new-feature $ git fetch upstream $ git rebase upstream/master $ git push --force origin new-feature

the result: (c commit branched from)

a -- b -- c -- d -- e (original origin/new-feature)            \-- f -- g (upstream/master)                      \-- d` -- e` (rebased origin/new-feature)

note commits d , e rewritten d` , e` on top of upstream/master, keeping history linear.

alternatively, can instead merge upstream/master branch , continue development, if project accept such pull request. advantage of approach exact history recorded, including merge action, means --force isn't required push branch origin.

$ git checkout origin/new-feature $ git fetch upstream $ git merge upstream/master $ git push origin new-feature

the result:

                    v (original origin/new-feature) -- b -- c -- d -- e -- h <- (post-merge origin/new-feature)            \-- f -- g --/                     ^ upstream/master

Comments

Post a Comment

Popular posts from this blog

searchKeyword not working in AngularJS filter -

i writing app using angularjs on front end. want search through table word/field; 1 search box everything. according article here: http://hello-angularjs.appspot.com/searchtable can use filter: searchkeyword this. this code, , not working expected. <label>search: <input ng-model="searchkeyword"></label> <table ng-repeat="post in posts | orderby: sort | filter: searchkeyword"> <tr> <td> {{index(post)}} </td> <td> {{post.title}} </td> <td> {{post.author}} </td> <td> {{post.content}} </td> <td> {{post.date | date: "d/m/yyyy"}} </td> </tr> </table> what should do? thank you try this: controller $scope.posts = [ {title:'title one', author:'author one', content: 'content one'}, {title:'title two', author:'author two', content: 'cont...
Read more

sequelize.js - Sequelize: sort by enum cases -

i have model ( article ) field (the name type ) of type enum('source', 'translated') , return 1 article ordered type field. source articles should returned before translated articles. like: article.findone(order: [ { type: [ 'source', 'translated' ] } ]); unfortunately there appears no built-in solution sorting enums. instead have sort by case , couldn't find documentation on how sequelize. what conventional approach here? sorting case hard in sequelize, sort field (the second answer in linked post) should possible: order: sequelize.fn('field', sequelize.col('type'), 'source', 'translated') it's supported mysql far know though
Read more

user interface - how to replace an ongoing process of image capture from another process call over the same ImageLabel in python's GUI TKinter -

i trying use following code create interactive gui changes color-space(hsv, rbg, grayscale etc) on event of button click. display opencv video in tkinter using multiprocessing being new python having problems multiprocessing , attempts on making gui change it's color space on button clicks hangs entire system. on it's implementation highly appreciated. thankyou. below code: import cv2 pil import image,imagetk import tkinter tk import numpy np multiprocessing import process , queue def quit_it(root,process): root.destroy() process.terminate() def black_andwhite(root,process): process.terminate p=process(target=capture_image, args=(5,queue, )) p.start() root.after(0, func=lambda: update_all(root, image_label, queue)) def update_image(image_label, queue): frame = queue.get() = image.fromarray(frame) b = imagetk.photoimage(image=a) image_label.configure(image=b) image_label._image_cache = b root.update() def update_all(root...
Read more