Skip to content
This repository has been archived by the owner on Dec 14, 2023. It is now read-only.

Commit

Permalink
update readme
Browse files Browse the repository at this point in the history
  • Loading branch information
skalpin authored and Jonathan Whittenton committed May 22, 2020
1 parent f276852 commit b5e224a
Showing 1 changed file with 30 additions and 1 deletion.
31 changes: 30 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,30 @@
# advanced-git-002
# advanced-git-003

## Links

This section is for some git related links.

[https://learngitbranching.js.org/?NODEMO](https://learngitbranching.js.org/?NODEMO)
[https://devblogs.microsoft.com/devops/supercharging-the-git-commit-graph/](https://devblogs.microsoft.com/devops/supercharging-the-git-commit-graph/)

## Change your default editor to VSCode

`git config --global core.editor "code --new-window --wait"`
[https://www.mking.net/blog/using-vscode-as-the-default-git-editor](https://www.mking.net/blog/using-vscode-as-the-default-git-editor)
## Git Grievances

- Uses vim as the default editor
- Is a cmd tool
- Was written in linux for linux, doesn't play nice with Windows

## Merge Tools

- Meld
- WinMerge
- kdiff3
- Araxis
- Deltawalker
- Visual Studio
- VS Code
- vimdiff
- Beyond Compare

0 comments on commit b5e224a

Please sign in to comment.