Skip to content

Instantly share code, notes, and snippets.

🏠
Working from home

Ody Mbegbu odytrice

🏠
Working from home
Block or report user

Report or block odytrice

Hide content and notifications from this user.

Learn more about blocking users

Contact Support about this user’s behavior.

Learn more about reporting abuse

Report abuse
View GitHub Profile
@dgoguerra
dgoguerra / p4merge-git-tool.md
Last active Jan 22, 2020
Setup p4merge as difftool and mergetool on Windows
View p4merge-git-tool.md

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
@OdeToCode
OdeToCode / gist:5024867
Last active Dec 14, 2015
AngularJS Snippet
View gist:5024867
<div ng-app="videoApp" ng-controller="VideoController">
<table>
<thead>
<th>Title</th>
<th>Length</th>
<th></th>
</thead>
<tbody>
<tr data-id="{{video.Id}}" ng-repeat="video in videos">
@tony4d
tony4d / p4merge4git.md
Created Aug 24, 2012
Setup p4merge as a visual diff and merge tool for git
View p4merge4git.md
You can’t perform that action at this time.