git - How can I move a set of commits from master to a separate branch? -

-

I have a series that relates to a special feature (20 +) which I try to remove from my master branch. And I am in a different branch.

I have a tag ( rel_2009_07_18 ) committed to represent the latest stable release, so when on guru, git log rel_2009_07_18 .. HEAD I set the commitment that I want to go to a different branch, there should be some command in this set, but I can cherish them because they are few.

I have seen the git filter-branch, but in the command option it is mentioned that leaving the commit but removing commit - definitely do not want to do this. I also saw the GIT Rebase, but he also mentioned the upstream broch to reuse the committee.

Is there any good option to take these cones to a different branch?

I'm not sure that this is a viable option and results in delivery, although small (3 developers), environment but I can execute the following small shift ...

    Change the name of the master locally to master_plus_feature (or similar ...)
  1. Checkout from the `rel_2009_07_18` tag
  2. From this point a new branch master
  3. Delete remote branches and push again from local

Ideas and su Wow Thanks!

You write that you want to 'remove' master from Remove . If the 'Master' branch has been published (well, after the rel_2009_07_18 is published), and someone can create this problem on the basis of their work on their 'master' . But maybe this is not a problem in your case.

The two solutions below assume that you have not made changes

if you can rewind 'master' branch:

$ git checkout Master $ git branch separate_brank $ git reset - Hard rel_2009_07_18

Now the 'master' is on the rel_2009_07_18 tag, and 'different branch' is where 'master' 'The final result is exactly the same as the set of steps you have proposed (changing the name of' Swami 'to' separate_bank ',' master 'to rel_2009_07_18 Only difference is in the reflogs.

If you can not rewind the 'master' branch 

> $ git checkout master $ git branch separate_branch $ git checkout rel_2009_07_18 - $ Git clean-df $ git commit -m 'rel_2009_07_18' returned to the state '

Note that this solution has not been tested! YMMV.


Comments

Post a Comment

Popular posts from this blog

c# - ListView onScroll event -

-
I am programming a simple C # application, and I need a Scallow event on the list view. So I inherited the original ListView class created in ListviewEx witch. I found out how to locate the scroll message from WinAPI and I modified the WndProc method. Now I have this WndProc: protected override zero WndProc (Ref message message) {base.WndProc (Ref I); If (m.msg == WM_VSCROLL) {onScroll (This, New EventArgs ()); }} But the problem is, I do not know how to know about scrolling information. This data should be in wParam, but there is a LOWORD macro ++ like in C in C # and I switch to find the criteria like SB_ below, SB_ENDSCROLL, SB_PAGEUP etc. there any way Need to change the LOWORD macro from C #? Or any other way to find the necessary parameters about scrolling? You can define the WParam constants as the following: Private const int WM_HSCROLL = 0x114; Private Constant WM_VSCROLL = 0x115; Private contact int SBHOZZ = 0; Private Consultant SB_VERT = 1; Private Con...
Read more

PHP - get image from byte array -

-
I am trying to create a back-end for my mobile application. I am sending the content of an image in the body of the HTTP request (output stream) as a byte array, I want to read this stream of bytes in PHP scripts and take back an image. Can anyone tell me how can I do this? Thank you. You can obtain the request body $ body = Reading from file_get_contents ('php: // input'); What you do with that data Depending on you, you can write the data in a file as you mentioned that this is image data, you can drop the data into the object can do. Another option is to use and load the image.
Read more

Linux Terminal Problem with Non-Canonical Terminal I/O app -

-
I have a small app written in C to run on Linux. Part of the app accepts user-input from keyboard , And it uses non-canonical terminal mode so that it can respond to each keystroke. The section of the code that accepts input is a simple task that is called repeatedly in the loop: char get_input () {char C = 0; Int res = reading (input_tamille, & amp; c, 1); If (RSS == 0) 0 returns; If (res == -1) {/ * snip error handling * /} return c; } It reads a letter from the terminal if there is no input within a given time limit, (c_cc [VTIME] value in the vocabulary structure), read () 0 And get_input () is called again It all works very well, I have recently discovered that if you run this app in a terminal window, and then the app Close the terminal window without ending, the app will not exit Received, but CPU intensive launches into an infinite loop, where the read () returns 0 without waiting continued. So how can I get out of the apple if it runs from the terminal win...
Read more