storing git credentials with gpg and .netrc
- set up git credential helper in .gitconfig
[credential] helper = /usr/share/git/credential/netrc/git-credential-netrc.perl
- add login configuration to .netrc
PATH is an important concept when working on the command line. It's a list
of directories that tell your operating system where to look for programs, so
that you can just write
script instead of
C:\Users\Me\bin\script. But different operating systems have different ways to
add a new directory to it:
Git for Windows comes bundled with the "Git Bash" terminal which is incredibly handy for unix-like commands on a windows machine. It is missing a few standard linux utilities, but it is easy to add ones that have a windows binary available.
The basic idea is that
C:\Program Files\Git\mingw64\ is your
/ directory according to Git Bash (note: depending on how you installed it, the directory might be different. from the start menu, right click on the Git Bash icon and open file location. It might be something like
mingw64 in this directory is your root. Find it by using
If you go to that directory, you will find the typical linux root folder structure (
lib and so on).
If you are missing a utility, such as wget, track down a binary for windows and copy the files to the corresponding directories. Sometimes the windows binary have funny prefixes, so
|"description": "jekyll, asset build using npm scripts",|
|"eslint:dist": "eslint src/scripts/*.js",|
|"eslint": "npm run eslint:dist",|
|"uglify:dist": "uglify -s src/scripts/*.js -o dist/scripts/main.min.js",|
|"uglify:_site": "uglify -s src/scripts/*.js -o _site/dist/scripts/main.min.js",|
I recently upgraded to a new system, and instead of running Arch Linux natively I've decided to run it inside VirtualBox on Windows 10. Below I note down the steps I took, which closely follow the excellent wiki pages of archlinux. But along the way, I also noted a few other steps steps I took to make this system very comfortable, which you'll have to figure out for yourself if you like them or not!
There isn't much of preparation required, given that I started from scratch, but I did have to setup my windows environment a little bit.
This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).
Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.
Switch to the master branch and make sure you are up to date: