Gitkraken diff tool12/17/2023 ![]() ![]() This script maps arguments of external tool call to WinMerge’s command-line syntax and sets some additional options. "C:\Program Files (x86)\WinMerge\WinMergeU.exe" /e /u /x /wl /wr /dl "Base" /dr "New" %1 %2 # /dr specifies a description in the right side title bar, just like /dl. # /dl specifies a description in the left side title bar, overriding the default folder or filename text Use this when you don't want to change right side items in the compare. Use this when you don't want to change left side items in the compare. # /x closes WinMerge (after displaying an information dialog) when you start a comparison of identical files # /u prevents WinMerge from adding either path (left or right) to the Most Recently Used (MRU) list # /e enables you to close WinMerge with a single Esc key press. Create a file named git-winmerge.bat in some directory with such code in it: Install (or make sure you have installed) msysGit and WinMerge.Ģ. WinMerge is the utility to compare two text files side-by-side with convenient coloring of differences and navigation through them (as of 2.14 it only works on Windows). But this functionality is not properly set up in msysGit (aka Git for Windows) out-of-the-box (as of 1.9.5). ![]() Gitk has a feature allowing to view the differences between two files in repository in an external application. Gitk is the utility to view commit history of a Git repository.īut comparing files in this tool (on the bottom of the picture above) is a pain, mainly because it only shows changes as small extracts, hiding the context of the patch. ![]() These are installed with official distribution of Git. I still prefer working most time in tools called git gui and gitk which lie between powerful command-line tools and eye-candy GUIs like TortoiseGit and SourceTree. Call us if you feel like your company’s coding in a Model T and instead want ride a rocket.I use Git version control system frequently, and tend to learn some new tricks and practices of using it. We’re Clear Measure, a consultancy helping you learn to deliver high quality code faster. Beyond Compare, my preferred Git Merge/Diff tool.Tortoise Git, which has a great way to compare branches, and it has ~80% feature parity with the CLI client.Git for-each-ref -sort=committerdate refs/heads/ -format='| %(committerdate:short) | %(authorname) | %(refname:short)' > branch-history.mdįinally # replace "git checkout" with "git branch -D" Then echo "| LastCommittedOn | LastCommitedBy | Branch" > branch-history.mdĮcho "|-|-|-" > branch-history.md # replace "remote/origin/" with "git checkout " These steps create a Markdown report of a repository’s branches sorted by last committed date.Ĭheck out all branches git branch -list -all | clip You’ll hopefully never need this, but maybe it’ll inspire something similar. up = !git pull -rebase -prune & git submodule update -init -recursiveīclean = "!f() f" I have two aliases from Phil Haack that I use pretty regularly. Include my Git Aliases | You’ve Been Haacked Git Aliases We can’t and won’t take credit for all these great Git gems. When it comes to being powerful with Git, there’s still (often) no beating the command line by leveraging Git aliases. Here at Clear Measure we like to think we know what’s what and how’s how. ![]()
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |