So I did a "git rebase interactively" in SourceTree, and the result wasn't exactly as expected.   Result:    Intended / wanted situation (ms-paint'ed):     In other words i want to   Move the branch point to after commit c4d389e Move commit 5a57dea to after c4d389e on the main branch delete commits 474e72f, b61bbf50 on the shadow branch as they will be duplicates after moving the branching point, and delete afba1b9 and 0f2b626 as they have no business on the shadow branch   I haven't pushed the commits to any remote repo.  Can anyone please tell me what steps I need to do? Iv'e seen the big -thread, but I don't really understand how to apply the answers to this particular situation.
Does anybody know how to easily undo a git rebase?  The only way that comes to mind is to go at it manually:   git checkout the commit parent to both of the branches  then create a temp branch from there cherry-pick all commits by hand replace the branch in which I rebased by the manually-created branch   In my current situation this is gonna work because I can easily spot commits from both branches (one was my stuff, the other was my colleague's stuff).  However my approach strikes me as suboptimal and error-prone (let's say I had just rebased with 2 of my own branches).  Any ideas?  Clarification: I'm talking about a rebase during which a bunch of commits were replayed. Not only one.
Why is ridge regression called "ridge", why is it needed, and what happens when $\lambda$ goes to infinity? Legend in tikzpicture Run command whenever someone joins a Minecraft server Is there any way to run a command automatically when a player joins the server? I need to do this without the use of a Bukkit plugin. I think it's possible with MCP but I want to know how! Change the default editor when sudo visudo When doing sudo visudo, the default editor is nano. I want to change it to vi or vim.     I already made vim the default editor, and use it as a substitute for gedit to open php, .txt, .c and .h files, by placing a vim.desktop file in ~/.local/share/applications/ and by correctly editing either  ~/.local/share/applications/mimeapps.list or /etc/gnome/defaults.list. However apparently this does not apply to nano.    Any clue ? Difference between pts and tty GitHub pages are not updating House address is not listed on Google Maps When I search for my address on Google Maps it cannot be found which means I can't order takeaway etc.  Is there a way of adding my address to Google Maps or even add a street address?  I want the address to be publicly available so others can search it. PostgreSQL: running count of rows for a query 'by minute' It seems that there are many ways to prove the Sylow theorems. I'd like to see a collection of them. Please write down or share links to any you know. What is the name of the vertical bar in $(x^2+1)\vert_{x = 4}$ or $\left.\left(\frac{x^3}{3}+x+c\right) \right\vert_0^4$? I've always wanted to know what the name of the vertical bar in these examples was:  $f(x)=(x^2+1)\vert_{x = 4}$ (I know this means evaluate $x$ at $4$) $\int_0^4 (x^2+1) \,dx = \left.\left(\frac{x^3}{3}+x+c\right) \right\vert_0^4$ (and I know this means that you would then evaluate at $x=0$ and $x=4$, then subtract $F(4)-F(0)$ if finding the net signed area)  I know it seems trivial, but it's something I can't really seem to find when I go googling and the question came up in my calc class last night and no one seemed to know. Also, for bonus internets; What is the name of the horizontal bar in $\frac{x^3}{3}$? Is that called an obelus? Let us look at some sample data for 5 hypothetical subjects.  library(emmeans) library(lme4)  # generate some sample data # condition (Placebo, Treatment) # type (some factor, e.g. two different medications) # value (outcome of interest) # subject  data &lt;- data.frame(condition = as.factor(rep(c(0,1), times = 10)), value = rnorm(20), type = rep(c("A","B"), each = 10), subject = as.factor(rep(rep(1:5, each = 2), times = 2)))   Now we like to conduct a mixed model and post-hoc tests with emmeans, where we test conditions per type in a pairwise fashion:  # caluculate a mixed model fit_data &lt;- lmer(value ~ condition*type + (1|subject), data = data)  # emmeans post-hoc test emmeans(fit_data, pairwise ~ condition | type)   So for each type (A or B), I have paired data (condition 0 has 5 data points and condition 1 has 5 data points). If I would do a paired t-test like so:  # paired t-test t.test(data[data$condition==0 &amp; data$type=="A","value"], data[data$condition==1 &amp; data$type=="A","value"], paired = TRUE) t.test(data[data$condition==0 &amp; data$type=="B","value"], data[data$condition==1 &amp; data$type=="B","value"], paired = TRUE)   I would get degrees of freedom of 4 for the paired t-test, but emmeans says the degrees of freedom are 12. Why is there this huge difference? If the emmeans package also would use df = 4, then the p-values would also be more comparable. Reference for statistical mechanics from information theoretic view I am interested in knowing if some one here knows book/notes for statistical mechanics from the information theoretic viewpoint.  Additional Request from user83014  "Jaynes wrote a paper called Information theory and statistical mechanics (1957). I tried to read this but found it somewhat hard to follow, and I suspect it's because it's one of the earlier works, and that a modern text might be more refined since we've had time to work it out. On the other hand, what I've read from physics textbooks don't explicitly talk about information theoretic concepts like shannon entropy.  "Is there a good modern introduction to the information theoretic view of entropy?" Automatically Locate Included Images Do you think it's possible to include images into LaTeX without specifying the exact path to them. So instead of:  \includegraphics{path/to/image/myfig.pdf}   It would be:  \includegraphics{myfig.pdf}   While the image would still reside in the path/to/image/ directory. Basically, I'm asking if there is a macro that can recursively search for the image.  An alternative for me is to write a script outside of LaTeX that determines all the images that are included, performs the recursive search and copies those files temporarily in the same directory as the .tex file. Zsh says "no matches found" when trying to download video with youtube-dl I downloaded youtube-dl using pip on CrunchBang (a Debian Wheezy distro). When I run   youtube-dl {video URL}   I get  zsh: no matches found: {video URL}   I guess it has something to do with zsh, because I found some users on Arch forums complaining about it. When I switched to bash it worked. I reviewed  in the First Posts queue.  Which said      i changed it to 'localsystem' and done. thanks much   So it obviously was a potential low quality post. But sometimes such answers can be spot on, so I checked it out, better safe than sorry. I turned out the post had been deleted. Great! So I clicked "No action needed". Then I got this:    You can imagine I felt "wrongfully accused".  I think that deleted posts should not be used for review audits, because the meaning of "No action needed" is not clear in this context. This is by far the weirdest problem I've come across,  My mac can perfectly access internet through safari web browser, but when I tried to do   ping www.google.com   through the terminal, it's requests is being timed out.  None of the other apps are able to reach internet either. Dropbox, Skype, Spotify all showing offline, except the browser itself  I'm guessing something bad with the DNS, but spend 2 hours trying to fix this with no luck Connect to a MySQL server over SSH in PHP Start script on open blender file Java string to date conversion Can I find out which tags I have created? This would be interesting to know.  The tags could be highlighted on the users page for example.