Sync up your fork with upstream without creating merge commit

From your fork on the local machine

cd  <fork>
git checkout master
git fetch upstream
git rebase upstream/master
git push -f

This will make your fork match up with what's upstream

 

 

Remove CTRL-M characters from a file in UNIX

Recently one of my files started getting these ^M characters at the end of each line. I wanted to remove them quickly and use sed to remove them

sed -i "s/^M//" filename

You need to enter ^M by pressing Ctrl and then pressing V and M in succession



Remove CTRL-M characters from a file in UNIX

Change a string in a file based on line number

I came across this situation where I needed to change the timeout of a certain command alone in a script temporarily and automatically. I came across a solution using sed

sed -i "24s/timeoutValue1/timeValue2/" fileName

Ref:
Replace String Based on Line Number

Changing the size of wallpaper in RHEL 7

I was trying to change my wallpaper and put up the new image. But it was zoomed in and I couldn't figure out how to change from zoomed to scaled.

On googling, I found the link below. You need dconf-editor to do this. Open up dconf-editor and go to

org -> gnome -> desktop -> background

and there you can change from zoomed to scaled.


Ref:
Cant change size of wallpaper (stock or from home/pictures) 13.10 using gnome3

How to search for multiple strings in a file using grep

I wanted to search for both ERROR and FAIL in a file using grep.

Came across this:

grep -E "ERROR|FAIL" filename

Or

grep "ERROR\|FAIL" filename

For searching a file for lines not containing a string

grep -v "PASS" filename 

Reference:
Grep OR, AND and NOT operators

Upgrading from Fedora 22 to Fedora 23

I got a new laptop today and was trying to install Fedora 23 on it. However, I wasn't able to get to Fedora 23 and had to install Fedora 22 and upgrade to Fedora 23. I found the instructions online and proceeded.

Upgrading from Fedora 22 to Fedora 23

Renew or release DHCP IP address

Recently I had an issue with the network on one of my test machines. After some debugging and some help, we figured out that the DHCP IP address needed to be released and renewed. 

I ran the following command:

sudo dhclient eth0

Search for results excluding a word

To search for something excluding a certain word or phrase, use

grep -v "word" <file or location>

For example, the results of a grep search can include a lot of results which are not relevant. Eliminate those by using grep -v

 grep "blah" filename | grep -v "foo"

This will get you results with "blah" but nothing with "blah" and "foo" in them. 

 

 

Get public IP address of your computer

Open up the Terminal Application and run the command below to get the public IP address of your computer

dig +short myip.opendns.com @resolver1.opendns.com

Reference:
How to find my public IP address from command line on linux

Getting backtrace from qemu-kvm crash

When I'm running automated tests, qemu-kvm sometimes crashes and this needs to be debugged ASAP. To file a bug, I need a backtrace. As part of the test, the core which is dumped is saved.

1. SSH into the machine where qemu-kvm crashed
2. debuginfo-install qemu-kvm => This should install a bunch of packages to get a lot of symbol info. 
3. gdb /usr/libexec/qemu-kvm <path to core file>
4. Pass "thread apply all bt" to get the backtrace at the gdb prompt

./configure options

When building packages, often we need to run ./configure with a bunch of options to build the package. To find out what the last options were used for configure, use this command:

./config.status --config

How to remember ./configure script arguments a year later

Combine 2 commits into one and update pull request

Finally, I was able to combine 2 commits into 1 commit and update the pull request. This will save me lots of time instead of creating a new pull request everytime and re-do work.

First time:

git clone <my-clone-of-upstream-repo>
cd <upstream-repo>
git remote add upstream <upstream-repo>
git config --global push.default simple

When starting a new pull request:

git checkout -b <new-branch>

Make changes, commit and send pull request. 

When combining n commits:

git fetch upstream
git merge-base new-branch master => This will generate a commit hash
git rebase --interactive <commit hash>

Your text editor will open with a file that lists all the commits in new-branch, and in front of each commit is the word "pick". For every line except the first, you want to replace the word "pick" with the word "squash" or "fixup". Save this file. 

git rebase upstream/master
git push -f

You're Done!

How to Rebase a Pull Request

Start vim without .vim settings

In my .vim settings, I have audo indent and smart indent enabled. Sometimes when I'm copying code, this causes the code to completely go wonky.

So, to avoid this and just copy the code, I disable the vim settings and open the file using

vim -u NONE filename

 

Restarting gnome-shell

Often, my desktop will get stuck into a weird position - particularly when I plug in and out of my dock (multi-monitors). Restarting gnome-shell fixes the problem.

You can restart the gnome-shell by pressing Alt+F2 and then typing in either "restart" or just "r" and pressing enter

Commenting a block of code in vi

Many times, when modifying code or debugging, I comment out blocks of code. This is tedious to do manually.

I searched around for a way to do it fast and came across this tip:

For commenting a block of text is almost the same: First, go to the first line you want to comment, press CtrlV, and select until the last line. Second, press ShiftI#Esc (then give it a second), and it will insert a # character on all selected lines. For the stripped-down version of vim shipped with debian/ubuntu by default, type : s/^/# in the second step instead.

Use a specific repo for installing a package

I was facing an issue at work today where I needed to install a package from a repo. The repo for that package had been created in yum. However, one of the other repos had an issue where the url for that repo was not reachable and this caused "yum install" to fail for me constantly. 

 So I wanted to a way to install my package from a particular repo and not involve any other repo. The only way I found to do this is to disable all other repos and enable only the repo I want and install the package from it. 

To do that:

yum --disablerepo="*" --enablerepo="reponame" install pkgName

You can substitute reponame and pkgName with the names of the actual repo you want to use and package you want to install.

Syncing a fork of github

I use github for my work and have a fork of some repositories. When I send a pull request, often I have issues with my fork being out of sync with the main repository.

Today, I synced up my fork without any issues. Here's how I did it.

Go to folder which contains the clone of of your fork.

git remote add upstream https://github.com/upstreamreponame/repo.git
git fetch upstream
git checkout master (to make sure you're on master)

If you want to make sure these changes don't show up as a checkin on ur fork:

git merge upstream/master

This worked great for me!

References:
Syncing a fork
How to update GitHub forked respository
Updating a fork directly from github