Compare commits

..

No commits in common. "main" and "Branch2" have entirely different histories.

7 changed files with 4 additions and 51 deletions

Binary file not shown.

View File

@ -14,26 +14,13 @@
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 1,
"SelectedChildIndex": 13,
"Children": [
{
"$type": "Bookmark",
"Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Program.cs",
"DocumentMoniker": "D:\\\u0418\u043F207\u041A\\ConsoleGit\\ConsoleGit\\Program.cs",
"RelativeDocumentMoniker": "ConsoleGit\\Program.cs",
"ToolTip": "D:\\\u0418\u043F207\u041A\\ConsoleGit\\ConsoleGit\\Program.cs",
"RelativeToolTip": "ConsoleGit\\Program.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-24T07:38:19.739Z",
"EditorCaption": ""
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
},
@ -89,7 +76,7 @@
"RelativeDocumentMoniker": "ConsoleGit\\Program.cs",
"ToolTip": "D:\\\u0418\u043F207\u041A\\ConsoleGit\\ConsoleGit\\Program.cs",
"RelativeToolTip": "ConsoleGit\\Program.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAA==",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAYAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-24T07:38:19.739Z",
"EditorCaption": ""

View File

@ -14,7 +14,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 14,
"SelectedChildIndex": 13,
"Children": [
{
"$type": "Bookmark",
@ -69,10 +69,6 @@
"Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Program.cs",
@ -80,7 +76,7 @@
"RelativeDocumentMoniker": "ConsoleGit\\Program.cs",
"ToolTip": "D:\\\u0418\u043F207\u041A\\ConsoleGit\\ConsoleGit\\Program.cs",
"RelativeToolTip": "ConsoleGit\\Program.cs",
"ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAZAAAAAAAAAA==",
"ViewState": "AgIAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-02-24T07:38:19.739Z",
"EditorCaption": ""

View File

@ -11,7 +11,6 @@ namespace ConsoleGit
static void Main(string[] args)
{
Console.WriteLine("Hi");
Console.WriteLine("Lolik and Bobik");
}
}
}

29
aq
View File

@ -1,29 +0,0 @@
diff.astextplain.textconv=astextplain
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.smudge=git-lfs smudge -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
http.sslbackend=openssl
http.sslcainfo=C:/Program Files/Git/mingw64/etc/ssl/certs/ca-bundle.crt
core.autocrlf=true
core.fscache=true
core.symlinks=false
pull.rebase=false
credential.helper=manager
credential.https://dev.azure.com.usehttppath=true
init.defaultbranch=master
credential.http://94.233.26.154:3000.provider=generic
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.smudge=git-lfs smudge -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
core.symlinks=false
core.ignorecase=true
remote.remove.url=origin
remote.remove.fetch=+refs/heads/*:refs/remotes/remove/*
remote.origin.url=http://kamtk.ru:4000/Lika/MyFirstRepo.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*