@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,38 @@
1
+ diff_cmd () {
2
+ "$merge_tool_path" \
3
+ -R 'Accel.Search: "Ctrl+F"' \
4
+ -R 'Accel.SearchForward: "Ctrl+G"' \
5
+ "$LOCAL" "$REMOTE"
6
+
7
+ # xxdiff can segfault on binary files which are often uninteresting.
8
+ # Do not allow segfaults to stop us from continuing on to the next file.
9
+ if test $? = 128
10
+ then
11
+ return 1
12
+ fi
13
+ }
14
+
15
+ diff_cmd_help () {
16
+ echo "Use xxdiff (requires a graphical session)"
17
+ }
18
+
19
+ merge_cmd () {
20
+ if $base_present
21
+ then
22
+ "$merge_tool_path" -X --show-merged-pane \
23
+ -R 'Accel.SaveAsMerged: "Ctrl+S"' \
24
+ -R 'Accel.Search: "Ctrl+F"' \
25
+ -R 'Accel.SearchForward: "Ctrl+G"' \
26
+ --merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
27
+ else
28
+ "$merge_tool_path" -X $extra \
29
+ -R 'Accel.SaveAsMerged: "Ctrl+S"' \
30
+ -R 'Accel.Search: "Ctrl+F"' \
31
+ -R 'Accel.SearchForward: "Ctrl+G"' \
32
+ --merged-file "$MERGED" "$LOCAL" "$REMOTE"
33
+ fi
34
+ }
35
+
36
+ merge_cmd_help () {
37
+ echo "Use xxdiff (requires a graphical session)"
38
+ }
Binary file