TelenkovDmitry 1 ano atrás
pai
commit
26ee84e73c
2 arquivos alterados com 182 adições e 184 exclusões
  1. 181 183
      .obsidian/workspace.json
  2. 1 1
      proGit.md

+ 181 - 183
.obsidian/workspace.json

@@ -1,184 +1,182 @@
-{
-  "main": {
-    "id": "b266890f0c3ff372",
-    "type": "split",
-    "children": [
-      {
-        "id": "9f5d5ca1dbbe7210",
-        "type": "tabs",
-        "dimension": 50.38880248833593,
-        "children": [
-          {
-            "id": "2e32c5a6e9f28052",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "proGit.md",
-                "mode": "source",
-                "source": false
-              }
-            },
-            "group": "5cfac0e29502b01e"
-          }
-        ]
-      },
-      {
-        "id": "af790371e55e7c76",
-        "type": "tabs",
-        "dimension": 49.61119751166407,
-        "children": [
-          {
-            "id": "f4f8feb3f8a62cd0",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "proGit.md",
-                "mode": "source",
-                "source": false
-              }
-            },
-            "group": "5cfac0e29502b01e"
-          }
-        ]
-      }
-    ],
-    "direction": "vertical"
-  },
-  "left": {
-    "id": "38e075dd31ff8adb",
-    "type": "split",
-    "children": [
-      {
-        "id": "aa544a1476f258b3",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "8ba77c810766b520",
-            "type": "leaf",
-            "state": {
-              "type": "file-explorer",
-              "state": {
-                "sortOrder": "alphabetical"
-              }
-            }
-          },
-          {
-            "id": "b71a6ef4ea258338",
-            "type": "leaf",
-            "state": {
-              "type": "search",
-              "state": {
-                "query": "",
-                "matchingCase": false,
-                "explainSearch": false,
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical"
-              }
-            }
-          },
-          {
-            "id": "0a44d6178b5d79a8",
-            "type": "leaf",
-            "state": {
-              "type": "bookmarks",
-              "state": {}
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 200
-  },
-  "right": {
-    "id": "22baf11b84f2becb",
-    "type": "split",
-    "children": [
-      {
-        "id": "3ebf2f88c333ddfb",
-        "type": "tabs",
-        "children": [
-          {
-            "id": "016cd6639f5f7c6e",
-            "type": "leaf",
-            "state": {
-              "type": "backlink",
-              "state": {
-                "file": "proGit.md",
-                "collapseAll": false,
-                "extraContext": false,
-                "sortOrder": "alphabetical",
-                "showSearch": false,
-                "searchQuery": "",
-                "backlinkCollapsed": false,
-                "unlinkedCollapsed": true
-              }
-            }
-          },
-          {
-            "id": "a1fda84e12066836",
-            "type": "leaf",
-            "state": {
-              "type": "all-properties",
-              "state": {
-                "sortOrder": "frequency",
-                "showSearch": false,
-                "searchQuery": ""
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
-  },
-  "left-ribbon": {
-    "hiddenItems": {
-      "switcher:Open quick switcher": false,
-      "graph:Open graph view": false,
-      "canvas:Create new canvas": false,
-      "command-palette:Open command palette": false,
-      "markdown-importer:Open format converter": false
-    }
-  },
-  "active": "f4f8feb3f8a62cd0",
-  "lastOpenFiles": [
-    "bt67xx/common.md",
-    "linux/linux common.md",
-    "linux/Arbiter.md",
-    "BT7000/BT-7000 Artery.md",
-    "Кодинг.md",
-    "links.md",
-    "Список литературы.md",
-    "Разное.md",
-    "linux/Tmux.md",
-    "linux/Raspberry PI.md",
-    "linux/GS server.md",
-    "Счета.md",
-    "Тренировки и занятия.md",
-    "TODO.md",
-    "2024-01-03.md",
-    "proGit.md",
-    "Artery testing.md",
-    "web hardcore",
-    "metrolog/M3 artery + stm32.md",
-    "web",
-    "docs/CAN megmeet Communication Protocol.pdf",
-    "docs/3KW Rectifier Can Communication Protocal V2 20220818 (1).pdf",
-    "docs/LT8920datasheetEngversion201701191.pdf",
-    "metrolog/Текучка Метролог.md",
-    "metrolog/IRQ + FreeRTOS.md",
-    "FlyElectronics/LED Controller.md",
-    "bt67xx",
-    "metrolog/M3 artery.md",
-    "metrolog/readme.md",
-    "Greenstar/FPGA Blaster.md",
-    "FlyElectronics/Grinding machine.md",
-    "img/sch04.JPG"
-  ]
+{
+  "main": {
+    "id": "b266890f0c3ff372",
+    "type": "split",
+    "children": [
+      {
+        "id": "9f5d5ca1dbbe7210",
+        "type": "tabs",
+        "dimension": 50.38880248833593,
+        "children": [
+          {
+            "id": "2e32c5a6e9f28052",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "proGit.md",
+                "mode": "source",
+                "source": false
+              }
+            },
+            "group": "5cfac0e29502b01e"
+          }
+        ]
+      },
+      {
+        "id": "af790371e55e7c76",
+        "type": "tabs",
+        "dimension": 49.61119751166407,
+        "children": [
+          {
+            "id": "f4f8feb3f8a62cd0",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "proGit.md",
+                "mode": "source",
+                "source": false
+              }
+            },
+            "group": "5cfac0e29502b01e"
+          }
+        ]
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "38e075dd31ff8adb",
+    "type": "split",
+    "children": [
+      {
+        "id": "aa544a1476f258b3",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "8ba77c810766b520",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {
+                "sortOrder": "alphabetical"
+              }
+            }
+          },
+          {
+            "id": "b71a6ef4ea258338",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              }
+            }
+          },
+          {
+            "id": "0a44d6178b5d79a8",
+            "type": "leaf",
+            "state": {
+              "type": "bookmarks",
+              "state": {}
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 200
+  },
+  "right": {
+    "id": "22baf11b84f2becb",
+    "type": "split",
+    "children": [
+      {
+        "id": "3ebf2f88c333ddfb",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "016cd6639f5f7c6e",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "file": "proGit.md",
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              }
+            }
+          },
+          {
+            "id": "a1fda84e12066836",
+            "type": "leaf",
+            "state": {
+              "type": "all-properties",
+              "state": {
+                "sortOrder": "frequency"
+              }
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "left-ribbon": {
+    "hiddenItems": {
+      "switcher:Меню быстрого перехода": false,
+      "graph:Граф": false,
+      "canvas:Создать новый холст": false,
+      "command-palette:Открыть палитру команд": false,
+      "markdown-importer:Импорт Markdown-файлов": false
+    }
+  },
+  "active": "f4f8feb3f8a62cd0",
+  "lastOpenFiles": [
+    "bt67xx/common.md",
+    "linux/linux common.md",
+    "linux/Arbiter.md",
+    "BT7000/BT-7000 Artery.md",
+    "Кодинг.md",
+    "links.md",
+    "Список литературы.md",
+    "Разное.md",
+    "linux/Tmux.md",
+    "linux/Raspberry PI.md",
+    "linux/GS server.md",
+    "Счета.md",
+    "Тренировки и занятия.md",
+    "TODO.md",
+    "2024-01-03.md",
+    "proGit.md",
+    "Artery testing.md",
+    "web hardcore",
+    "metrolog/M3 artery + stm32.md",
+    "web",
+    "docs/CAN megmeet Communication Protocol.pdf",
+    "docs/3KW Rectifier Can Communication Protocal V2 20220818 (1).pdf",
+    "docs/LT8920datasheetEngversion201701191.pdf",
+    "metrolog/Текучка Метролог.md",
+    "metrolog/IRQ + FreeRTOS.md",
+    "FlyElectronics/LED Controller.md",
+    "bt67xx",
+    "metrolog/M3 artery.md",
+    "metrolog/readme.md",
+    "Greenstar/FPGA Blaster.md",
+    "FlyElectronics/Grinding machine.md",
+    "img/sch04.JPG"
+  ]
 }

+ 1 - 1
proGit.md

@@ -27,7 +27,7 @@ $ git push origin :<branchName>
 ```
 Переименование последнего коммита:
 ```bash
-git commit --amend -m "Новое название коммита"`
+git commit --amend -m "Новое название коммита"
 ```
 При клонировании проекта с сабмодулями:
 В склонирвоанном проекте выполнить: