ivelichkevich ivelichkevich

Updating a feature branch

First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)

$ git checkout master

Fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master

macOS is a Unix, and not built on Linux.

I think most of us realize that macOS isn't a Linux OS, but what that also means is that instead of shipping with the GNU flavor of command line tools, it ships with the FreeBSD flavor. As such, writing shell scripts which can work across both platforms can sometimes be challenging.

Homebrew

Homebrew can be used to install the GNU versions of tools onto your Mac, but they are all prefixed with "g" by default.

All commands have been installed with the prefix "g". If you need to use these commands with their normal names, you can add a "gnubin" directory to your PATH from your bashrc.

32-bit ELF binary

how to assemble and link:

nasm -f elf32 -o <filename>.o <filename>.asm
ld -m elf_i386 -o <filename> <filename>.o

template code (hello world):

section .text
global _start

prerequisites

Compile the program in gcc with debug symbols enabled (-g)
Do NOT strip the binary
To generate assembly code using gcc use the -S option: gcc -S hello.c

	# Luke's config for the Zoomer Shell

	# Enable colors and change prompt:
	autoload -U colors && colors
	PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "

	# History in cache directory:
	HISTSIZE=10000
	SAVEHIST=10000
	HISTFILE=~/.cache/zsh/history

	$remoteport = bash.exe -c "ifconfig eth0 \| grep 'inet '"
	$found = $remoteport -match '\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}';

	if( $found ){
	$remoteport = $matches[0];
	} else{
	echo "The Script Exited, the ip address of WSL 2 cannot be found";
	exit;
	}

	$ git clone [email protected]:xxxxx/xxxx.git my-awesome-proj
	Cloning into 'my-awesome-proj'...
	ssh: connect to host github.com port 22: Connection timed out
	fatal: Could not read from remote repository.

	$ # This should also timeout
	$ ssh -T [email protected]
	ssh: connect to host github.com port 22: Connection timed out

	$ # but this might work

	<project>
	...
	<build>
	<plugins>
	<plugin>
	<groupId>org.jacoco</groupId>
	<artifactId>jacoco-maven-plugin</artifactId>
	<executions>
	<execution>
	<id>default-prepare-agent</id>

	# Linux
	# add the following to "~/.gitconfig" file

	[merge]
	tool = intellij
	[mergetool "intellij"]
	cmd = /usr/local/bin/idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
	trustExitCode = true

	[diff]