@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.
Files changed (84) hide show
  1. package/LICENSE +7 -0
  2. package/README.md +10 -2
  3. package/git/bin/git +0 -0
  4. package/git/bin/scalar +0 -0
  5. package/git/etc/gitconfig +13 -0
  6. package/git/libexec/git-core/git +0 -0
  7. package/git/libexec/git-core/git-archimport +4 -0
  8. package/git/libexec/git-core/git-cvsexportcommit +4 -0
  9. package/git/libexec/git-core/git-cvsimport +4 -0
  10. package/git/libexec/git-core/git-cvsserver +4 -0
  11. package/git/libexec/git-core/git-daemon +0 -0
  12. package/git/libexec/git-core/git-difftool--helper +125 -0
  13. package/git/libexec/git-core/git-filter-branch +665 -0
  14. package/git/libexec/git-core/git-http-backend +0 -0
  15. package/git/libexec/git-core/git-http-fetch +0 -0
  16. package/git/libexec/git-core/git-http-push +0 -0
  17. package/git/libexec/git-core/git-imap-send +0 -0
  18. package/git/libexec/git-core/git-instaweb +4 -0
  19. package/git/libexec/git-core/git-merge-octopus +112 -0
  20. package/git/libexec/git-core/git-merge-one-file +167 -0
  21. package/git/libexec/git-core/git-merge-resolve +64 -0
  22. package/git/libexec/git-core/git-mergetool +579 -0
  23. package/git/libexec/git-core/git-mergetool--lib +549 -0
  24. package/git/libexec/git-core/git-quiltimport +155 -0
  25. package/git/libexec/git-core/git-receive-pack +0 -0
  26. package/git/libexec/git-core/git-remote-ftp +0 -0
  27. package/git/libexec/git-core/git-remote-ftps +0 -0
  28. package/git/libexec/git-core/git-remote-http +0 -0
  29. package/git/libexec/git-core/git-remote-https +0 -0
  30. package/git/libexec/git-core/git-request-pull +178 -0
  31. package/git/libexec/git-core/git-send-email +4 -0
  32. package/git/libexec/git-core/git-sh-i18n +79 -0
  33. package/git/libexec/git-core/git-sh-i18n--envsubst +0 -0
  34. package/git/libexec/git-core/git-sh-setup +357 -0
  35. package/git/libexec/git-core/git-shell +0 -0
  36. package/git/libexec/git-core/git-submodule +671 -0
  37. package/git/libexec/git-core/git-upload-archive +0 -0
  38. package/git/libexec/git-core/git-upload-pack +0 -0
  39. package/git/libexec/git-core/git-web--browse +196 -0
  40. package/git/libexec/git-core/mergetools/araxis +26 -0
  41. package/git/libexec/git-core/mergetools/bc +37 -0
  42. package/git/libexec/git-core/mergetools/codecompare +31 -0
  43. package/git/libexec/git-core/mergetools/deltawalker +33 -0
  44. package/git/libexec/git-core/mergetools/diffmerge +26 -0
  45. package/git/libexec/git-core/mergetools/diffuse +23 -0
  46. package/git/libexec/git-core/mergetools/ecmerge +22 -0
  47. package/git/libexec/git-core/mergetools/emerge +34 -0
  48. package/git/libexec/git-core/mergetools/examdiff +24 -0
  49. package/git/libexec/git-core/mergetools/guiffy +26 -0
  50. package/git/libexec/git-core/mergetools/gvimdiff +1 -0
  51. package/git/libexec/git-core/mergetools/kdiff3 +44 -0
  52. package/git/libexec/git-core/mergetools/kompare +19 -0
  53. package/git/libexec/git-core/mergetools/meld +97 -0
  54. package/git/libexec/git-core/mergetools/nvimdiff +1 -0
  55. package/git/libexec/git-core/mergetools/opendiff +22 -0
  56. package/git/libexec/git-core/mergetools/p4merge +44 -0
  57. package/git/libexec/git-core/mergetools/smerge +20 -0
  58. package/git/libexec/git-core/mergetools/tkdiff +24 -0
  59. package/git/libexec/git-core/mergetools/tortoisemerge +40 -0
  60. package/git/libexec/git-core/mergetools/vimdiff +657 -0
  61. package/git/libexec/git-core/mergetools/vscode +19 -0
  62. package/git/libexec/git-core/mergetools/winmerge +23 -0
  63. package/git/libexec/git-core/mergetools/xxdiff +38 -0
  64. package/git/libexec/git-core/scalar +0 -0
  65. package/git/share/bash-completion/completions/git +4115 -0
  66. package/git/share/git-core/templates/description +1 -0
  67. package/git/share/git-core/templates/hooks/applypatch-msg.sample +15 -0
  68. package/git/share/git-core/templates/hooks/commit-msg.sample +74 -0
  69. package/git/share/git-core/templates/hooks/fsmonitor-watchman.sample +168 -0
  70. package/git/share/git-core/templates/hooks/post-update.sample +8 -0
  71. package/git/share/git-core/templates/hooks/pre-applypatch.sample +14 -0
  72. package/git/share/git-core/templates/hooks/pre-commit.sample +49 -0
  73. package/git/share/git-core/templates/hooks/pre-merge-commit.sample +13 -0
  74. package/git/share/git-core/templates/hooks/pre-push.sample +53 -0
  75. package/git/share/git-core/templates/hooks/pre-rebase.sample +169 -0
  76. package/git/share/git-core/templates/hooks/pre-receive.sample +24 -0
  77. package/git/share/git-core/templates/hooks/prepare-commit-msg.sample +42 -0
  78. package/git/share/git-core/templates/hooks/push-to-checkout.sample +78 -0
  79. package/git/share/git-core/templates/hooks/sendemail-validate.sample +77 -0
  80. package/git/share/git-core/templates/hooks/update.sample +128 -0
  81. package/git/share/git-core/templates/info/exclude +6 -0
  82. package/licenses/git/COPYING +360 -0
  83. package/licenses/git/LGPL-2.1 +511 -0
  84. package/package.json +122 -4
@@ -0,0 +1,196 @@
1
+ #!/bin/sh
2
+ #
3
+ # This program launch a web browser on the html page
4
+ # describing a git command.
5
+ #
6
+ # Copyright (c) 2007 Christian Couder
7
+ # Copyright (c) 2006 Theodore Y. Ts'o
8
+ #
9
+ # This file is heavily stolen from git-mergetool.sh, by
10
+ # Theodore Y. Ts'o (thanks) that is:
11
+ #
12
+ # Copyright (c) 2006 Theodore Y. Ts'o
13
+ #
14
+ # This file is licensed under the GPL v2, or a later version
15
+ # at the discretion of Junio C Hamano or any other official
16
+ # git maintainer.
17
+ #
18
+
19
+ USAGE='[--browser=browser|--tool=browser] [--config=conf.var] url/file ...'
20
+
21
+ # This must be capable of running outside of git directory, so
22
+ # the vanilla git-sh-setup should not be used.
23
+ NONGIT_OK=Yes
24
+ . git-sh-setup
25
+
26
+ valid_custom_tool()
27
+ {
28
+ browser_cmd="$(git config "browser.$1.cmd")"
29
+ test -n "$browser_cmd"
30
+ }
31
+
32
+ valid_tool() {
33
+ case "$1" in
34
+ firefox | iceweasel | seamonkey | iceape | \
35
+ chrome | google-chrome | chromium | chromium-browser | \
36
+ konqueror | opera | w3m | elinks | links | lynx | dillo | open | \
37
+ start | cygstart | xdg-open)
38
+ ;; # happy
39
+ *)
40
+ valid_custom_tool "$1" || return 1
41
+ ;;
42
+ esac
43
+ }
44
+
45
+ init_browser_path() {
46
+ browser_path=$(git config "browser.$1.path")
47
+ if test -z "$browser_path" &&
48
+ test "$1" = chromium &&
49
+ type chromium-browser >/dev/null 2>&1
50
+ then
51
+ browser_path=chromium-browser
52
+ fi
53
+ : ${browser_path:="$1"}
54
+ }
55
+
56
+ while test $# != 0
57
+ do
58
+ case "$1" in
59
+ -b|--browser*|-t|--tool*)
60
+ case "$#,$1" in
61
+ *,*=*)
62
+ browser=$(expr "z$1" : 'z-[^=]*=\(.*\)')
63
+ ;;
64
+ 1,*)
65
+ usage ;;
66
+ *)
67
+ browser="$2"
68
+ shift ;;
69
+ esac
70
+ ;;
71
+ -c|--config*)
72
+ case "$#,$1" in
73
+ *,*=*)
74
+ conf=$(expr "z$1" : 'z-[^=]*=\(.*\)')
75
+ ;;
76
+ 1,*)
77
+ usage ;;
78
+ *)
79
+ conf="$2"
80
+ shift ;;
81
+ esac
82
+ ;;
83
+ --)
84
+ break
85
+ ;;
86
+ -*)
87
+ usage
88
+ ;;
89
+ *)
90
+ break
91
+ ;;
92
+ esac
93
+ shift
94
+ done
95
+
96
+ test $# = 0 && usage
97
+
98
+ if test -z "$browser"
99
+ then
100
+ for opt in "$conf" "web.browser"
101
+ do
102
+ test -z "$opt" && continue
103
+ browser="$(git config $opt)"
104
+ test -z "$browser" || break
105
+ done
106
+ if test -n "$browser" && ! valid_tool "$browser"; then
107
+ echo >&2 "git config option $opt set to unknown browser: $browser"
108
+ echo >&2 "Resetting to default..."
109
+ unset browser
110
+ fi
111
+ fi
112
+
113
+ if test -z "$browser" ; then
114
+ if test -n "$DISPLAY"; then
115
+ browser_candidates="firefox iceweasel google-chrome chrome chromium chromium-browser konqueror opera seamonkey iceape w3m elinks links lynx dillo xdg-open"
116
+ if test "$KDE_FULL_SESSION" = "true"; then
117
+ browser_candidates="konqueror $browser_candidates"
118
+ fi
119
+ else
120
+ browser_candidates="w3m elinks links lynx"
121
+ fi
122
+ # SECURITYSESSIONID indicates an OS X GUI login session
123
+ if test -n "$SECURITYSESSIONID" || test -n "$TERM_PROGRAM"
124
+ then
125
+ browser_candidates="open $browser_candidates"
126
+ fi
127
+ # /bin/start indicates MinGW
128
+ if test -x /bin/start; then
129
+ browser_candidates="start $browser_candidates"
130
+ fi
131
+ # /usr/bin/cygstart indicates Cygwin
132
+ if test -x /usr/bin/cygstart; then
133
+ browser_candidates="cygstart $browser_candidates"
134
+ fi
135
+
136
+ for i in $browser_candidates; do
137
+ init_browser_path $i
138
+ if type "$browser_path" > /dev/null 2>&1; then
139
+ browser=$i
140
+ break
141
+ fi
142
+ done
143
+ test -z "$browser" && die "No known browser available."
144
+ else
145
+ valid_tool "$browser" || die "Unknown browser '$browser'."
146
+
147
+ init_browser_path "$browser"
148
+
149
+ if test -z "$browser_cmd" && ! type "$browser_path" > /dev/null 2>&1; then
150
+ die "The browser $browser is not available as '$browser_path'."
151
+ fi
152
+ fi
153
+
154
+ case "$browser" in
155
+ firefox|iceweasel|seamonkey|iceape)
156
+ # Check version because firefox < 2.0 does not support "-new-tab".
157
+ vers=$(expr "$($browser_path -version)" : '.* \([0-9][0-9]*\)\..*')
158
+ NEWTAB='-new-tab'
159
+ test "$vers" -lt 2 && NEWTAB=''
160
+ "$browser_path" $NEWTAB "$@" &
161
+ ;;
162
+ google-chrome|chrome|chromium|chromium-browser)
163
+ # No need to specify newTab. It's default in chromium
164
+ "$browser_path" "$@" &
165
+ ;;
166
+ konqueror)
167
+ case "$(basename "$browser_path")" in
168
+ konqueror)
169
+ # It's simpler to use kfmclient to open a new tab in konqueror.
170
+ browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')"
171
+ type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found."
172
+ "$browser_path" newTab "$@" &
173
+ ;;
174
+ kfmclient)
175
+ "$browser_path" newTab "$@" &
176
+ ;;
177
+ *)
178
+ "$browser_path" "$@" &
179
+ ;;
180
+ esac
181
+ ;;
182
+ w3m|elinks|links|lynx|open|cygstart|xdg-open)
183
+ "$browser_path" "$@"
184
+ ;;
185
+ start)
186
+ exec "$browser_path" '"web-browse"' "$@"
187
+ ;;
188
+ opera|dillo)
189
+ "$browser_path" "$@" &
190
+ ;;
191
+ *)
192
+ if test -n "$browser_cmd"; then
193
+ ( eval "$browser_cmd \"\$@\"" )
194
+ fi
195
+ ;;
196
+ esac
@@ -0,0 +1,26 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" >/dev/null 2>&1
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use Araxis Merge (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" -wait -merge -3 -a1 \
13
+ "$BASE" "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
14
+ else
15
+ "$merge_tool_path" -wait -2 \
16
+ "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1
17
+ fi
18
+ }
19
+
20
+ merge_cmd_help () {
21
+ echo "Use Araxis Merge (requires a graphical session)"
22
+ }
23
+
24
+ translate_merge_tool_path() {
25
+ echo compare
26
+ }
@@ -0,0 +1,37 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use Beyond Compare (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
13
+ -mergeoutput="$MERGED"
14
+ else
15
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
16
+ -mergeoutput="$MERGED"
17
+ fi
18
+ }
19
+
20
+ merge_cmd_help () {
21
+ echo "Use Beyond Compare (requires a graphical session)"
22
+ }
23
+
24
+ translate_merge_tool_path() {
25
+ if type bcomp >/dev/null 2>/dev/null
26
+ then
27
+ echo bcomp
28
+ else
29
+ echo bcompare
30
+ fi
31
+ }
32
+
33
+ list_tool_variants () {
34
+ echo bc
35
+ echo bc3
36
+ echo bc4
37
+ }
@@ -0,0 +1,31 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use Code Compare (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
13
+ -RF="$MERGED"
14
+ else
15
+ "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
16
+ -RF="$MERGED"
17
+ fi
18
+ }
19
+
20
+ merge_cmd_help () {
21
+ echo "Use Code Compare (requires a graphical session)"
22
+ }
23
+
24
+ translate_merge_tool_path() {
25
+ if merge_mode
26
+ then
27
+ echo CodeMerge
28
+ else
29
+ echo CodeCompare
30
+ fi
31
+ }
@@ -0,0 +1,33 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use DeltaWalker (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ # Adding $(pwd)/ in front of $MERGED should not be necessary.
11
+ # However without it, DeltaWalker (at least v1.9.8 on Windows)
12
+ # crashes with a JRE exception. The DeltaWalker user manual,
13
+ # shows $(pwd)/ whenever the '-merged' options is given.
14
+ # Adding it here seems to work around the problem.
15
+ if $base_present
16
+ then
17
+ "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
18
+ else
19
+ "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
20
+ fi >/dev/null 2>&1
21
+ }
22
+
23
+ merge_cmd_help () {
24
+ echo "Use DeltaWalker (requires a graphical session)"
25
+ }
26
+
27
+ translate_merge_tool_path () {
28
+ echo DeltaWalker
29
+ }
30
+
31
+ exit_code_trustable () {
32
+ true
33
+ }
@@ -0,0 +1,26 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use DiffMerge (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" --merge --result="$MERGED" \
13
+ "$LOCAL" "$BASE" "$REMOTE"
14
+ else
15
+ "$merge_tool_path" --merge \
16
+ --result="$MERGED" "$LOCAL" "$REMOTE"
17
+ fi
18
+ }
19
+
20
+ merge_cmd_help () {
21
+ echo "Use DiffMerge (requires a graphical session)"
22
+ }
23
+
24
+ exit_code_trustable () {
25
+ true
26
+ }
@@ -0,0 +1,23 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use Diffuse (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" \
13
+ "$LOCAL" "$MERGED" "$REMOTE" \
14
+ "$BASE" | cat
15
+ else
16
+ "$merge_tool_path" \
17
+ "$LOCAL" "$MERGED" "$REMOTE" | cat
18
+ fi
19
+ }
20
+
21
+ merge_cmd_help () {
22
+ echo "Use Diffuse (requires a graphical session)"
23
+ }
@@ -0,0 +1,22 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use ECMerge (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
13
+ --default --mode=merge3 --to="$MERGED"
14
+ else
15
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
16
+ --default --mode=merge2 --to="$MERGED"
17
+ fi
18
+ }
19
+
20
+ merge_cmd_help () {
21
+ echo "Use ECMerge (requires a graphical session)"
22
+ }
@@ -0,0 +1,34 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" -f emerge-files-command "$LOCAL" "$REMOTE"
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use Emacs' Emerge"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" \
13
+ -f emerge-files-with-ancestor-command \
14
+ "$LOCAL" "$REMOTE" "$BASE" \
15
+ "$(basename "$MERGED")"
16
+ else
17
+ "$merge_tool_path" \
18
+ -f emerge-files-command \
19
+ "$LOCAL" "$REMOTE" \
20
+ "$(basename "$MERGED")"
21
+ fi
22
+ }
23
+
24
+ merge_cmd_help () {
25
+ echo "Use Emacs' Emerge"
26
+ }
27
+
28
+ translate_merge_tool_path() {
29
+ echo emacs
30
+ }
31
+
32
+ exit_code_trustable () {
33
+ true
34
+ }
@@ -0,0 +1,24 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE" -nh
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use ExamDiff Pro (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
13
+ else
14
+ "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
15
+ fi
16
+ }
17
+
18
+ merge_cmd_help () {
19
+ echo "Use ExamDiff Pro (requires a graphical session)"
20
+ }
21
+
22
+ translate_merge_tool_path() {
23
+ mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
24
+ }
@@ -0,0 +1,26 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use Guiffy's Diff Tool (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" -s "$LOCAL" \
13
+ "$REMOTE" "$BASE" "$MERGED"
14
+ else
15
+ "$merge_tool_path" -m "$LOCAL" \
16
+ "$REMOTE" "$MERGED"
17
+ fi
18
+ }
19
+
20
+ merge_cmd_help () {
21
+ echo "Use Guiffy's Diff Tool (requires a graphical session)"
22
+ }
23
+
24
+ exit_code_trustable () {
25
+ true
26
+ }
@@ -0,0 +1 @@
1
+ . "$MERGE_TOOLS_DIR/vimdiff"
@@ -0,0 +1,44 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" \
3
+ --L1 "$MERGED (A)" --L2 "$MERGED (B)" \
4
+ "$LOCAL" "$REMOTE" >/dev/null 2>&1
5
+ }
6
+
7
+ diff_cmd_help () {
8
+ echo "Use KDiff3 (requires a graphical session)"
9
+ }
10
+
11
+ merge_cmd () {
12
+ if $base_present
13
+ then
14
+ "$merge_tool_path" --auto \
15
+ --L1 "$MERGED (Base)" \
16
+ --L2 "$MERGED (Local)" \
17
+ --L3 "$MERGED (Remote)" \
18
+ -o "$MERGED" "$BASE" "$LOCAL" "$REMOTE" \
19
+ >/dev/null 2>&1
20
+ else
21
+ "$merge_tool_path" --auto \
22
+ --L1 "$MERGED (Local)" \
23
+ --L2 "$MERGED (Remote)" \
24
+ -o "$MERGED" "$LOCAL" "$REMOTE" \
25
+ >/dev/null 2>&1
26
+ fi
27
+ }
28
+
29
+ merge_cmd_help () {
30
+ echo "Use KDiff3 (requires a graphical session)"
31
+ }
32
+
33
+ exit_code_trustable () {
34
+ true
35
+ }
36
+
37
+ translate_merge_tool_path() {
38
+ if type kdiff3 >/dev/null 2>/dev/null
39
+ then
40
+ echo kdiff3
41
+ else
42
+ mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3"
43
+ fi
44
+ }
@@ -0,0 +1,19 @@
1
+ can_merge () {
2
+ return 1
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use Kompare (requires a graphical session)"
7
+ }
8
+
9
+ diff_cmd () {
10
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
11
+ }
12
+
13
+ merge_cmd_help () {
14
+ echo "Use Kompare (requires a graphical session)"
15
+ }
16
+
17
+ exit_code_trustable () {
18
+ true
19
+ }
@@ -0,0 +1,97 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use Meld (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ check_meld_for_features
11
+
12
+ option_auto_merge=
13
+ if test "$meld_use_auto_merge_option" = true
14
+ then
15
+ option_auto_merge="--auto-merge"
16
+ fi
17
+
18
+ if test "$meld_has_output_option" = true
19
+ then
20
+ "$merge_tool_path" $option_auto_merge --output="$MERGED" \
21
+ "$LOCAL" "$BASE" "$REMOTE"
22
+ else
23
+ "$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
24
+ fi
25
+ }
26
+
27
+ merge_cmd_help () {
28
+ echo "Use Meld (requires a graphical session) with optional \`auto merge\` (see \`git help mergetool\`'s \`CONFIGURATION\` section)"
29
+ }
30
+
31
+ # Get meld help message
32
+ init_meld_help_msg () {
33
+ if test -z "$meld_help_msg"
34
+ then
35
+ meld_path="$(git config mergetool.meld.path || echo meld)"
36
+ meld_help_msg=$("$meld_path" --help 2>&1)
37
+ fi
38
+ }
39
+
40
+ # Check the features and set flags
41
+ check_meld_for_features () {
42
+ # Check whether we should use 'meld --output <file>'
43
+ if test -z "$meld_has_output_option"
44
+ then
45
+ meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
46
+ case "$meld_has_output_option" in
47
+ true | false)
48
+ : use configured value
49
+ ;;
50
+ *)
51
+ : empty or invalid configured value, detecting "--output" automatically
52
+ init_meld_help_msg
53
+
54
+ case "$meld_help_msg" in
55
+ *"--output="* | *'[OPTION...]'*)
56
+ # All version that has [OPTION...] supports --output
57
+ meld_has_output_option=true
58
+ ;;
59
+ *)
60
+ meld_has_output_option=false
61
+ ;;
62
+ esac
63
+ ;;
64
+ esac
65
+ fi
66
+ # Check whether we should use 'meld --auto-merge ...'
67
+ if test -z "$meld_use_auto_merge_option"
68
+ then
69
+ meld_use_auto_merge_option=$(
70
+ git config --bool-or-str mergetool.meld.useAutoMerge
71
+ )
72
+ case "$meld_use_auto_merge_option" in
73
+ true | false)
74
+ : use well formatted boolean value
75
+ ;;
76
+ auto)
77
+ # testing the "--auto-merge" option only if config is "auto"
78
+ init_meld_help_msg
79
+
80
+ case "$meld_help_msg" in
81
+ *"--auto-merge"* | *'[OPTION...]'*)
82
+ meld_use_auto_merge_option=true
83
+ ;;
84
+ *)
85
+ meld_use_auto_merge_option=false
86
+ ;;
87
+ esac
88
+ ;;
89
+ "")
90
+ meld_use_auto_merge_option=false
91
+ ;;
92
+ *)
93
+ die "unknown mergetool.meld.useAutoMerge: $meld_use_auto_merge_option"
94
+ ;;
95
+ esac
96
+ fi
97
+ }
@@ -0,0 +1 @@
1
+ . "$MERGE_TOOLS_DIR/vimdiff"
@@ -0,0 +1,22 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3
+ }
4
+
5
+ diff_cmd_help () {
6
+ echo "Use FileMerge (requires a graphical session)"
7
+ }
8
+
9
+ merge_cmd () {
10
+ if $base_present
11
+ then
12
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
13
+ -ancestor "$BASE" -merge "$MERGED" | cat
14
+ else
15
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
16
+ -merge "$MERGED" | cat
17
+ fi
18
+ }
19
+
20
+ merge_cmd_help () {
21
+ echo "Use FileMerge (requires a graphical session)"
22
+ }