This repository has been archived by the owner on Dec 14, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
30 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |