StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p><strong>Overview</strong><br/> The following is instructions on how to setup GIT Version Control so that you can use a better set of tools than the default installation. The setup requires that GIT Extensions is already installed and involves configuring Winmerge in GIT extensions. </p> <p><strong>Installation</strong><br/> Walk through all the prompts and install in the default directory for Winmerge.</p> <p><strong>Configure Winmerge in GIT Version Control</strong><br/> Open a new doc in a text editor. Copy/paste the following and save the document as "wMerge.sh" to your "C:\Program Files (x86)\Git\bin\" directory.</p> <pre><code>echo Launching WinMerge: $1 $2 "C:/Program Files (x86)/WinMerge/WinMergeU.exe" -e -u -dl "Original" -dr "Modified" "$1" "$2" </code></pre> <p>Goto your "Users->username" directory and locate the .gitconfig file. Open it in your favorite editor copy/paste the following code and Save: </p> <pre><code>[user] name = enter your name email = youremail@yourdomain.com [core] autocrlf = false [merge] tool = winmerge [mergetool "winmerge"] cmd = wMerge.sh \"$MERGED\" \"$REMOTE\" path = c:/Program Files (x86)/winmerge/winmergeu.exe [mergetool] keepBackup = false trustExitCode = false [diff] guitool = winmerge [difftool "winmerge"] path = c:/Program Files (x86)/winmerge/winmergeu.exe cmd = \"c:/Program Files (x86)/winmerge/winmergeu.exe\" \"$LOCAL\" \"$REMOTE\" </code></pre> <p>Run "GitExtensions", goto "tools->Settings->Git Extensions->Git Config". If you've done your installation properly and referenced the tools to their directory, your global settings page should look like below (NOTE: Please fill in your name on name and email):<br/><br/> mergetool: <code>winmerge</code><br/> path to mergetool: <code>c:/Program Files (x86)/winmerge/winmergeu.exe</code> <br/> mergetool command: <code>wMerge.sh "$MERGED" "$REMOTE"</code> <br/> difftool: <code>winmerge</code> <br/> path to difftool: <code>c:/Program Files (x86)/winmerge/winmergeu.exe</code> <br/> difftool command: <code>"c:/Program Files (x86)/winmerge/winmergeu.exe" "$LOCAL" "$REMOTE"</code> <br/><br/> line endings: checkout as-is, commit as-is <br/><br/> Navigate to the checklist tab to verify that GIT is all "green" and satisfied with your setup.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload