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

Latest commit

 

History

History
36 lines (28 loc) · 888 Bytes

README.md

File metadata and controls

36 lines (28 loc) · 888 Bytes

advanced-git-003

<<<<<<< HEAD

Links

This section is for some git related links.

https://learngitbranching.js.org/?NODEMO 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

Git Grievances

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

update readme =======

Merge Tools

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

update readme