![.gitconfig settings for araxis merge .gitconfig settings for araxis merge](http://www.sourcegear.com/images/screenshots/diffmerge/mac_file_window_merge.png)
- .gitconfig settings for araxis merge install#
- .gitconfig settings for araxis merge update#
- .gitconfig settings for araxis merge upgrade#
- .gitconfig settings for araxis merge code#
- .gitconfig settings for araxis merge free#
An optional value suffix of k, m, or g in the config file will cause the value to be multiplied by 1024, 1048576, or 1073741824 prior to output. int git config will ensure that the output is a simple decimal number. bool git config will ensure that the output is "true" or "false" l, -list List all variables set in config file. unset-all Remove all lines matching the key from config file. unset Remove the line matching the key from config file. rename-section Rename the given section to a new name. remove-section Remove the given section from the configuration file. f config-file, -file config-file Use the given config file instead of the one specified by GIT_CONFIG. For reading options: read only from system-wide $(prefix)/etc/gitconfig rather than from all available files. system For writing options: write to system-wide $(prefix)/etc/gitconfig rather than the repository. For reading options: read only from global ~/.gitconfig rather than from all available files. global For writing options: write to global ~/.gitconfig file rather than the repository. get-regexp Like -get-all, but interprets the name as a regular expression. get-all Like get, but does not fail if the number of values for the key is not exactly one.
.gitconfig settings for araxis merge code#
Returns error code 1 if the key was not found and error code 2 if multiple key values were found. get Get the value for a given key (optionally filtered by a regex matching the value). This is the same as providing ^$ as the value_regex in -replace-all. add Adds a new line to the option without altering any existing values. This replaces all lines matching the key (and optionally the value_regex). replace-all Default behavior is to replace at most one line. you use -global option without $HOME being properly set. you try to unset/set an option for which multiple lines match, or. you try to unset an option which does not exist. git/config unless defined otherwise with GIT_DIR and GIT_CONFIG (see the section called « FILES »). The default is to assume the config file of the current repository. The file-option can be one of -system, -global or -file which specify where the values will be read from or written to. If no type specifier is passed, no checks or transformations are performed on the value. The type specifier can be either -int or -bool, to make git config ensure that the variable(s) are of the given type and convert the value to the canonical form (simple decimal number for int, a "true" or "false" string for bool), or -path, which does some path expansion (see -path below). If you want to handle the lines that do not match the regex, just prepend a single exclamation mark in front (see also the section called « EXAMPLES »). Only the existing values that match the regexp are updated or unset.
.gitconfig settings for araxis merge update#
If you want to update or unset an option which can occur on multiple lines, a POSIX regexp value_regex needs to be given. Multiple lines can be added to an option by using the -add option. The name is actually the section and the key separated by a dot, and the value will be escaped. We do see some problems crop up from time to time, as changes in Git can introduce different behavior (like, my previous comments about bc3 that used to be a requirement, before they patched and added bc).You can query/set/replace/unset options with this command. I just tested with Git 2.12 and 2.13.0.windows.1, using the Git Bash, and was able to use git difftool without issue.
.gitconfig settings for araxis merge install#
The documentation notes that if the install path is different you should substitute the correct install path on your system:ģ2-bit Windows users should replace "C:\Program Files (x86)" with "C:\Program Files".Ħ4-bit Windows users with a fresh install of BC 4.1+ should replace "C:\Program Files (x86)" with "C:\Program Files".
.gitconfig settings for araxis merge upgrade#
BC4's upgrade prioritizes leaving it in the current directory, but fresh 4.1 installs are placed in the regular, 64bit Program Files\. This depends on if there was a pre-existing BC4.0 install before a 4.1 upgrade. The install folder by default is either Program Files\ or Program Files (x86)\.
.gitconfig settings for araxis merge free#
All BC 4.x updates are free for 4.x users.