mcmillen
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
15 Commits
1 Branch
0 Tags
31 KiB
Tree: 348f62c557
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '348f62c557'
${ noResults }
dotfiles/gitconfig

7 lines
121 B
Raw Normal View History

add gitconfig
3 years ago
​
​
gitconfig: set default branch to "main"
3 years ago
​
gitconfig: add conflictstyle=diff3
3 years ago
​
  1. [user]
  2. name = Colin McMillen
  3. email = colin@semicolin.games
  4. [init]
  5. defaultBranch = main
  6. [merge]
  7. conflictstyle = diff3