@noldova/checkpoints.git.darwin-arm64 0.0.0-stage → 0.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +7 -0
- package/README.md +10 -2
- package/git/bin/git +0 -0
- package/git/bin/scalar +0 -0
- package/git/etc/gitconfig +13 -0
- package/git/libexec/git-core/git +0 -0
- package/git/libexec/git-core/git-archimport +4 -0
- package/git/libexec/git-core/git-cvsexportcommit +4 -0
- package/git/libexec/git-core/git-cvsimport +4 -0
- package/git/libexec/git-core/git-cvsserver +4 -0
- package/git/libexec/git-core/git-daemon +0 -0
- package/git/libexec/git-core/git-difftool--helper +125 -0
- package/git/libexec/git-core/git-filter-branch +665 -0
- package/git/libexec/git-core/git-http-backend +0 -0
- package/git/libexec/git-core/git-http-fetch +0 -0
- package/git/libexec/git-core/git-http-push +0 -0
- package/git/libexec/git-core/git-imap-send +0 -0
- package/git/libexec/git-core/git-instaweb +4 -0
- package/git/libexec/git-core/git-merge-octopus +112 -0
- package/git/libexec/git-core/git-merge-one-file +167 -0
- package/git/libexec/git-core/git-merge-resolve +64 -0
- package/git/libexec/git-core/git-mergetool +579 -0
- package/git/libexec/git-core/git-mergetool--lib +549 -0
- package/git/libexec/git-core/git-quiltimport +155 -0
- package/git/libexec/git-core/git-receive-pack +0 -0
- package/git/libexec/git-core/git-remote-ftp +0 -0
- package/git/libexec/git-core/git-remote-ftps +0 -0
- package/git/libexec/git-core/git-remote-http +0 -0
- package/git/libexec/git-core/git-remote-https +0 -0
- package/git/libexec/git-core/git-request-pull +178 -0
- package/git/libexec/git-core/git-send-email +4 -0
- package/git/libexec/git-core/git-sh-i18n +79 -0
- package/git/libexec/git-core/git-sh-i18n--envsubst +0 -0
- package/git/libexec/git-core/git-sh-setup +357 -0
- package/git/libexec/git-core/git-shell +0 -0
- package/git/libexec/git-core/git-submodule +671 -0
- package/git/libexec/git-core/git-upload-archive +0 -0
- package/git/libexec/git-core/git-upload-pack +0 -0
- package/git/libexec/git-core/git-web--browse +196 -0
- package/git/libexec/git-core/mergetools/araxis +26 -0
- package/git/libexec/git-core/mergetools/bc +37 -0
- package/git/libexec/git-core/mergetools/codecompare +31 -0
- package/git/libexec/git-core/mergetools/deltawalker +33 -0
- package/git/libexec/git-core/mergetools/diffmerge +26 -0
- package/git/libexec/git-core/mergetools/diffuse +23 -0
- package/git/libexec/git-core/mergetools/ecmerge +22 -0
- package/git/libexec/git-core/mergetools/emerge +34 -0
- package/git/libexec/git-core/mergetools/examdiff +24 -0
- package/git/libexec/git-core/mergetools/guiffy +26 -0
- package/git/libexec/git-core/mergetools/gvimdiff +1 -0
- package/git/libexec/git-core/mergetools/kdiff3 +44 -0
- package/git/libexec/git-core/mergetools/kompare +19 -0
- package/git/libexec/git-core/mergetools/meld +97 -0
- package/git/libexec/git-core/mergetools/nvimdiff +1 -0
- package/git/libexec/git-core/mergetools/opendiff +22 -0
- package/git/libexec/git-core/mergetools/p4merge +44 -0
- package/git/libexec/git-core/mergetools/smerge +20 -0
- package/git/libexec/git-core/mergetools/tkdiff +24 -0
- package/git/libexec/git-core/mergetools/tortoisemerge +40 -0
- package/git/libexec/git-core/mergetools/vimdiff +657 -0
- package/git/libexec/git-core/mergetools/vscode +19 -0
- package/git/libexec/git-core/mergetools/winmerge +23 -0
- package/git/libexec/git-core/mergetools/xxdiff +38 -0
- package/git/libexec/git-core/scalar +0 -0
- package/git/share/bash-completion/completions/git +4115 -0
- package/git/share/git-core/templates/description +1 -0
- package/git/share/git-core/templates/hooks/applypatch-msg.sample +15 -0
- package/git/share/git-core/templates/hooks/commit-msg.sample +74 -0
- package/git/share/git-core/templates/hooks/fsmonitor-watchman.sample +168 -0
- package/git/share/git-core/templates/hooks/post-update.sample +8 -0
- package/git/share/git-core/templates/hooks/pre-applypatch.sample +14 -0
- package/git/share/git-core/templates/hooks/pre-commit.sample +49 -0
- package/git/share/git-core/templates/hooks/pre-merge-commit.sample +13 -0
- package/git/share/git-core/templates/hooks/pre-push.sample +53 -0
- package/git/share/git-core/templates/hooks/pre-rebase.sample +169 -0
- package/git/share/git-core/templates/hooks/pre-receive.sample +24 -0
- package/git/share/git-core/templates/hooks/prepare-commit-msg.sample +42 -0
- package/git/share/git-core/templates/hooks/push-to-checkout.sample +78 -0
- package/git/share/git-core/templates/hooks/sendemail-validate.sample +77 -0
- package/git/share/git-core/templates/hooks/update.sample +128 -0
- package/git/share/git-core/templates/info/exclude +6 -0
- package/licenses/git/COPYING +360 -0
- package/licenses/git/LGPL-2.1 +511 -0
- package/package.json +122 -4
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
diff_cmd () {
|
|
2
|
+
empty_file=
|
|
3
|
+
|
|
4
|
+
# p4merge does not like /dev/null
|
|
5
|
+
if test "/dev/null" = "$LOCAL"
|
|
6
|
+
then
|
|
7
|
+
LOCAL="$(create_empty_file)"
|
|
8
|
+
fi
|
|
9
|
+
if test "/dev/null" = "$REMOTE"
|
|
10
|
+
then
|
|
11
|
+
REMOTE="$(create_empty_file)"
|
|
12
|
+
fi
|
|
13
|
+
|
|
14
|
+
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
15
|
+
|
|
16
|
+
if test -n "$empty_file"
|
|
17
|
+
then
|
|
18
|
+
rm -f "$empty_file"
|
|
19
|
+
fi
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
diff_cmd_help () {
|
|
23
|
+
echo "Use HelixCore P4Merge (requires a graphical session)"
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
merge_cmd () {
|
|
27
|
+
if ! $base_present
|
|
28
|
+
then
|
|
29
|
+
cp -- "$LOCAL" "$BASE"
|
|
30
|
+
create_virtual_base "$BASE" "$REMOTE"
|
|
31
|
+
fi
|
|
32
|
+
"$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
create_empty_file () {
|
|
36
|
+
empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
|
|
37
|
+
>"$empty_file"
|
|
38
|
+
|
|
39
|
+
printf "%s" "$empty_file"
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
merge_cmd_help () {
|
|
43
|
+
echo "Use HelixCore P4Merge (requires a graphical session)"
|
|
44
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
diff_cmd () {
|
|
2
|
+
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
|
|
3
|
+
}
|
|
4
|
+
|
|
5
|
+
diff_cmd_help () {
|
|
6
|
+
echo "Use Sublime Merge (requires a graphical session)"
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
merge_cmd () {
|
|
10
|
+
if $base_present
|
|
11
|
+
then
|
|
12
|
+
"$merge_tool_path" mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
|
|
13
|
+
else
|
|
14
|
+
"$merge_tool_path" mergetool "$LOCAL" "$REMOTE" -o "$MERGED"
|
|
15
|
+
fi
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
merge_cmd_help () {
|
|
19
|
+
echo "Use Sublime Merge (requires a graphical session)"
|
|
20
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
diff_cmd () {
|
|
2
|
+
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
3
|
+
}
|
|
4
|
+
|
|
5
|
+
diff_cmd_help () {
|
|
6
|
+
echo "Use TkDiff (requires a graphical session)"
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
merge_cmd () {
|
|
10
|
+
if $base_present
|
|
11
|
+
then
|
|
12
|
+
"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
|
|
13
|
+
else
|
|
14
|
+
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
|
|
15
|
+
fi
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
exit_code_trustable () {
|
|
19
|
+
true
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
merge_cmd_help () {
|
|
23
|
+
echo "Use TkDiff (requires a graphical session)"
|
|
24
|
+
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
can_diff () {
|
|
2
|
+
return 1
|
|
3
|
+
}
|
|
4
|
+
|
|
5
|
+
diff_cmd_help () {
|
|
6
|
+
echo "Use TortoiseMerge (requires a graphical session)"
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
merge_cmd () {
|
|
10
|
+
if $base_present
|
|
11
|
+
then
|
|
12
|
+
basename="$(basename "$merge_tool_path" .exe)"
|
|
13
|
+
if test "$basename" = "tortoisegitmerge"
|
|
14
|
+
then
|
|
15
|
+
"$merge_tool_path" \
|
|
16
|
+
-base "$BASE" -mine "$LOCAL" \
|
|
17
|
+
-theirs "$REMOTE" -merged "$MERGED"
|
|
18
|
+
else
|
|
19
|
+
"$merge_tool_path" \
|
|
20
|
+
-base:"$BASE" -mine:"$LOCAL" \
|
|
21
|
+
-theirs:"$REMOTE" -merged:"$MERGED"
|
|
22
|
+
fi
|
|
23
|
+
else
|
|
24
|
+
echo "$merge_tool_path cannot be used without a base" 1>&2
|
|
25
|
+
return 1
|
|
26
|
+
fi
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
translate_merge_tool_path() {
|
|
30
|
+
if type tortoisegitmerge >/dev/null 2>/dev/null
|
|
31
|
+
then
|
|
32
|
+
echo tortoisegitmerge
|
|
33
|
+
else
|
|
34
|
+
echo tortoisemerge
|
|
35
|
+
fi
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
merge_cmd_help () {
|
|
39
|
+
echo "Use TortoiseMerge (requires a graphical session)"
|
|
40
|
+
}
|