Undo a commit, then re-merge, in git? -


oops, i'd undo merge.

i made new branch, new_branch. did work on branch, , (in order have backup on file sync) checked in temporary commit.

then went master branch, , made 12 commits.

then went new_branch, , without thinking, ran:

git merge master

now history on branch looks this:

- master commit 1 - master commit 2 - master commit 3 ... - work in progress

i'd un-merge master, undo work in progress commit, re-merge master. i'd end history on branch looks instead:

- master commit 1 - master commit 2 - master commit 3 ... - master commit 12

and instead of 'work in progress' commit, have bunch of changed files in staging.

is possible? if so, how?

if understand correctly, new_branch code has been effected? , not wish keep work-in-progress code? , want new_branch fresh copy of latest of master?

in case, deleting branch , recreating might simple solution...

but let's answer question, in case misunderstood or you're interested.

in general, reset commit need find commit right before 1 you'd undo. in case, assume master commit 12.

then run git reset --hard master_commit_12_sha

if don't want have find sha (the series of numbers identifies commit), can count backwards head.

git reset --hard head~1

now, don't think asking this, if problem this:

  • master commit 1
  • master commit 2
  • mistake_commit
  • master commit 3 ...
  • master commit 12

in case, can either:

  • git rebase -i <master commit 2>^, in interactive rebase chose "remove" mistake_commit.
  • git revert mistake_commit, make new commit undoes changes make in mistake_commit. note: option may best if pushed origin, since not change history.

here links read said:


Comments

Post a Comment

Popular posts from this blog

java - pagination of xlsx file to XSSFworkbook using apache POI -

right in code, reading xlsx file, xssfworkbook, , writing database. but, when size of xlsx file increases, causes outofmemory error. can not increase server size, or divide xlsx file pieces. tried loading workbook using file (instead of inputstream), didn't either. i looking way read 10k rows @ time (instead of entire file @ once) , iteratively write workbook , database. is there way apache poi? poi contains called "eventmodel" designed purpose. it's mentioned in faq : the ss eventmodel package api reading excel files without loading whole spreadsheet memory. require more knowledge on part of user, reduces memory consumption more tenfold. based on awt event model in combination sax. if need read-only access, best way it. however, may want double check first if issue somewhere else. check out this item : i think poi using memory! can do? 1 comes quite lot, reason isn't might think. so, first thing check - what's source of prob...
Read more

Unlimited choices in BASH case statement -

consider simple bash snippet: case $option in 1) image=${options[0]%.tar} ;; 2) image=${options[1]%.tar} ;; 3) image=${options[2]%.tar} ;; 4) image=${options[3]%.tar} ;; *) echo "invalid option" exit 1 esac in real script numbers goes 30. makes pretty long. can somehow specify cases variable? something this: case $option in $i) image=${options[$(($i-1))]%.tar} any pointer appreciated. you can match against multiple patterns in single clause: case $option in 1|2|3: echo "$option one, 2 or three" ;; esac if still typing you, can use simple pattern matching: case $option in # following matches # - single-digit numbers 0-9 # - two-digit numbers starting either 1 or 2 # - number 30 [0-9]|[12][0-9]|30) image=${options[$(($option-1))]%.tar} ;; *) echo "invalid option" 1>&2 exit 1 esac
Read more

apache - How do I stop my index.php being run twice for every user -

we've got webapp initial html served using apache , php. i noticed index.php being run twice every request. seems caused / effected rewrite rules in our .htaccess - rewritecond %{http_host} ^(www\.|hotels\.)ourdomain\.com$ [nc,or] rewritecond %{server_name} ^(www\.|hotels\.)ourdomain\.com$ [nc] rewriterule (.*) http://ourdomain.com/$1 [r=301] rewriterule ^hotels/([^/]+)/?\??(.*)$ ?d=$1&$2 [qsa] the final rule moving parameter url path query string. i.e. http://ourdomain.com/hotels/vegas?someparam=1 becomes http://ourdomain.com?d=vegas&someparam=1 if go directly query string version index.php run once. if use url redirected, index.php run twice (i'm checking adding error_log('end of index.php') file). so example going http://ourdomain.com/hotels/paris hits file twice http://ourdomain.com?d=paris hits once. i've seen this question , had @ blog mentioned , , can't find empty string url's (i've tried using yslow process). ...
Read more