Open-source News

Skul: The Hero Slayer adds a whole new Dark Mirror mode for a ...  GamingOnLinux

Valve suffers a huge leak from various games like Portal, Half-Life 2 ...  GamingOnLinux

Intel last week introduced the 4th Gen Xeon Scalable "Sapphire Rapids" processors and kicking off this week is an exciting new development: patches are pending for upstreaming Sapphire Rapids processor support into the open-source Coreboot!..

Intel's FFmpeg Cartwheel is the repository where their latest FFmpeg GPU acceleration patches are housed until being upstreamed into FFmpeg proper. Out today is FFmpeg 2022Q4 as the latest collection of Intel's patches for this open-source multimedia library from new hardware support to enhancing AV1 and HEVC/H.265 accelerated video encoding...

GCC 13 Progresses To Stage 4 "Regression Fixes Only" Development  Phoronix

The GCC 13 code compiler has entered its stage four of development today where the focus now is only on regression fixes until eliminating all the highest priority regressions so that the GCC 13.1 stable release can then happen in the next 2~3 months...

How to use the Shared Folders feature in VirtualBox 7  TechRepublic

Following last week's release of Chrome 109 by Google, Mozilla has uploaded their release binaries today for Firefox 109. Firefox 109 is the web browser's first release of 2023 and has caught up to Google's Chrome with its versioning...

The Aspeed ACRY engine found with new AST2600 baseboard management controllers (BMCs) for accelerating ECDSA/RSA signature and verification tasks is set to see an upstream driver with the Linux 6.3 cycle...

Aspeed ACRY Engine Driver On Deck For Linux 6.3 To Speed-Up ...  Phoronix

Cybersecurity Experts Cast Doubt on Hackers' ICS Ransomware ...  SecurityWeek

NVIDIA engineers are working on upstreaming support for the new BlueField-3 DPU into the Linux kernel. This DPU rated for 400 Gb/s networking will see Ethernet driver support come Linux 6.3...

Ethernet Driver Support For NVIDIA's BlueField-3 DPU Coming To ...  Phoronix

How to Install Windows 11 on Your Chromebook  Beebom

Linux community presses for RNDIS to be marked as broken  Fudzilla

Linux community presses for RNDIS to be marked as broken  Fudzilla

Critical Control Web Panel Vulnerability Still Under Exploit Months ...  InfoQ.com

9to5Linux Weekly Roundup: January 15th, 2023  9to5Linux

MX Linux 21.3 "Wildflower" released: Debian 11.6 base, Xfce 4.18, improved hardware support  Neowin

Recover from an unsuccessful git rebase with the git reflog command agantony Mon, 01/16/2023 - 03:00

The git rebase command allows you to adjust the history of your Git repository. It's a useful feature, but of course, mistakes can be made. As is usually the case with Git, you can repair your error and restore your repository to a former state. To recover from an unsuccessful rebase, use the git reflog command.

Git reflog

Suppose you perform this interactive rebase:

$ git rebase -i HEAD~20

In this context, ~20 means to rebase the last 20 commits.

Unfortunately, in this imaginary scenario, you mistakenly squashed or dropped some commits you didn't want to lose. You've already completed the rebase, but this is Git, so of course, you can recover your lost commits.

Review your history with reflog

 Run the git reflog command to collect data and view a history of your interactions with your repository. This is an example for my demonstration repository, however, the result will vary depending on your actual repository:

$ git reflog 222967b (HEAD -> main) HEAD@{0}: rebase (finish): returning to refs/heads/main 222967b (HEAD -> main) HEAD@{1}: rebase (squash): My big rebase c388f0c HEAD@{2}: rebase (squash): # This is a combination of 20 commits 56ee04d HEAD@{3}: rebase (start): checkout HEAD~20 0a0f875 HEAD@{4}: commit: An old good commit [...]Find the last good commit

In this example, HEAD@{3} represents the start of your rebase. You can tell because its description is rebase (start).

The commit just under it, 0a0f875 HEAD@{4}, is the tip of your Git branch before you executed your incorrect rebase. Depending on how old and active your repository is, there are likely more lines below this one, but assume this is the commit you want to restore.

More on Git What is Git? Git cheat sheet Markdown cheat sheet New Git articles Restore the commit

To recover the commit you accidentally squashed and all of its parent commits, including those accidentally squashed or dropped, use git checkout. In this example, HEAD@{4} is the commit you need to restore, so that's the one to check out:

$ git checkout HEAD@{4}

With your good commit restored, you can create a new branch using git checkout -b as usual. Replace with your desired branch name, such as test-branch.

Git version control

Git's purpose is to track versions, and its default setting is usually to preserve as much data about your work as feasible. Learning to use new Git commands makes many of its most powerful features available and safeguards your work.

The git rebase command allows you to adjust the history of your Git repository. It's a useful feature, but of course, mistakes can be made. Use the git reflog command to recover.

Image by:

kris krüg

Git What to read next This work is licensed under a Creative Commons Attribution-Share Alike 4.0 International License. Register or Login to post a comment.