Skip to content

Instantly share code, notes, and snippets.

View Jaboo9's full-sized avatar

Jaboo9

View GitHub Profile
@Jaboo9
Jaboo9 / p4merge4git.md
Created June 21, 2020 10:05 — forked from tony4d/p4merge4git.md
change is contant
@Jaboo9
Jaboo9 / p4merge-git-tool.md
Created June 18, 2020 08:31 — forked from dgoguerra/p4merge-git-tool.md
Setup p4merge as difftool and mergetool on Windows

Setting up p4merge as diff and merge tool on Windows. Tried for Git version 1.8.4.msysgit.0.

Two alternatives are explained: using the command line, and directly editing the config file.

Setting up from the command line

Being the installation path "C:Program Files\Perforce\p4merge.exe", just run:

$ git config --global diff.tool p4merge
@Jaboo9
Jaboo9 / github.md
Created June 16, 2020 20:37 — forked from dahlbyk/github.md
Mastering GitHub

Mastering GitHub

GitHub is often used as a basic Git host, but its platform has so much more to offer. From simple and powerful issues and pull requests, to advanced features for power users and integrators, it’s a tool worth knowing well in its own right. This session will review everything you need to know to master collaboration with GitHub, from best practices for GitHub Issues and how it represents basic Git concepts, to hidden features and the tools enabling its developer ecosystem.

  • Git Hosting