14:27:27

$git pull

error: cannot open .git/FETCH_HEAD: Permission denied

14:27:43

$sudo git pull

remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/yurykalinin/aws
   848ae3b..5a22630  master     -> origin/master
Updating 848ae3b..5a22630
Fast-forward
 hello.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

14:27:53

$git diff

14:28:26

$sudo git diff hello.md

14:43:47

$ls -l

total 48
drwxr-xr-x 3 user user  4096 Dec 17 16:27 aws
-rw-r--r-- 1 root root    53 Dec 17 16:27 hello.md
-rw-r--r-- 1 root root 35149 Dec 17 16:02 LICENSE
-rw-r--r-- 1 root root    32 Dec 17 16:02 README.md

14:43:49

$cat hello.md

##Hello
**Hellow world**
##Goodbuy
**Goodbuy world**

14:43:54

$nano hello.md

14:44:51

$# Hello

14:44:53

$sudo nano hello.md

14:45:11

$# Hello

14:45:28

$# Hello

14:45:57

$# Introduction

On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   hello.md
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        aws/
no changes added to commit (use "git add" and/or "git commit -a")

14:46:12

$git add -p

diff --git a/hello.md b/hello.md
index 534273e..434c27e 100644
--- a/hello.md
+++ b/hello.md
@@ -1,4 +1,7 @@
-##Hello
+## Introduction
+Introduction to hello world
+
+## Hello
 **Hellow world**
-##Goodbuy
-**Goodbuy world**
+## Goodbye
+**Goodbye world**
Stage this hunk [y,n,q,a,d,/,s,e,?]? ^Z
[1]+  Stopped                 git add -p

14:47:58

$sudo nano hello.md

14:48:05

$# Introduction

14:49:33

$sudo nano hello.md

14:49:43

$sudo nano hello.md

14:49:58

$# Introduction

14:49:59

$cat hello.md

## Introduction
Introduction to hello world
## Hello
**Hello world**
## Goodbye
**Goodbye world**

14:50:54

$git add -p

diff --git a/hello.md b/hello.md
index 534273e..fbdae3d 100644
--- a/hello.md
+++ b/hello.md
@@ -1,4 +1,7 @@
-##Hello
-**Hellow world**
-##Goodbuy
-**Goodbuy world**
+## Introduction
...
-**Hellow world**
-##Goodbuy
-**Goodbuy world**
+## Introduction
+Introduction to hello world
+
+## Hello
+**Hello world**
+## Goodbye
+**Goodbye world**

14:51:28

$git status

On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   hello.md
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        aws/
no changes added to commit (use "git add" and/or "git commit -a")

14:51:33

$git add -p

diff --git a/hello.md b/hello.md
index 534273e..fbdae3d 100644
--- a/hello.md
+++ b/hello.md
@@ -1,4 +1,7 @@
-##Hello
-**Hellow world**
-##Goodbuy
-**Goodbuy world**
+## Introduction
...
-**Hellow world**
-##Goodbuy
-**Goodbuy world**
+## Introduction
+Introduction to hello world
+
+## Hello
+**Hello world**
+## Goodbye
+**Goodbye world**

14:52:02

$sudo git add -p

diff --git a/hello.md b/hello.md
index 534273e..fbdae3d 100644
--- a/hello.md
+++ b/hello.md
@@ -1,4 +1,7 @@
-##Hello
-**Hellow world**
-##Goodbuy
-**Goodbuy world**
+## Introduction
+Introduction to hello world
+
+## Hello
+**Hello world**
+## Goodbye
+**Goodbye world**
Stage this hunk [y,n,q,a,d,/,e,?]? y

14:52:11

$git status

On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)
        modified:   hello.md
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        aws/

14:52:16

$sudo git status

On branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)
        modified:   hello.md
Untracked files:
  (use "git add <file>..." to include in what will be committed)
        aws/

14:52:25

$ls -l

total 48
drwxr-xr-x 3 user user  4096 Dec 17 16:27 aws
-rw-r--r-- 1 root root    99 Dec 17 16:49 hello.md
-rw-r--r-- 1 root root 35149 Dec 17 16:02 LICENSE
-rw-r--r-- 1 root root    32 Dec 17 16:02 README.md

14:52:33

$rm /aws

rm: cannot remove '/aws': Is a directory

14:52:41

$sudo rm /aws/aws/

rm: cannot remove '/aws/aws/': Is a directory

14:52:58

$sudo rmdir /aws/aws/

rmdir: failed to remove '/aws/aws/': Directory not empty

14:53:05

$cd aws/

14:53:22

$ls -l

total 44
-rw-r--r-- 1 user user    53 Dec 17 16:27 hello.md
-rw-r--r-- 1 user user 35149 Dec 17 16:27 LICENSE
-rw-r--r-- 1 user user    32 Dec 17 16:27 README.md

14:53:24

$cat hello.md

##Hello
**Hellow world**
##Goodbuy
**Goodbuy world**

14:53:29

$sudo nano hello.md

14:54:12

$#introduction

##introduction
Introduction to hello world
## Hello
**Hello world**
## Goodbuy
**Goodbuy world**

14:54:15

$git sta

git: 'sta' is not a git command. See 'git --help'.
Did you mean one of these?
        status
        stage
        stash

14:54:19

$git status

On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   hello.md
no changes added to commit (use "git add" and/or "git commit -a")

14:54:21

$git add -p

diff --git a/hello.md b/hello.md
index 534273e..854a5e2 100644
--- a/hello.md
+++ b/hello.md
@@ -1,4 +1,7 @@
-##Hello
-**Hellow world**
-##Goodbuy
+##introduction
+Introduction to hello world
+
+## Hello
+**Hello world**
+## Goodbuy
 **Goodbuy world**
Stage this hunk [y,n,q,a,d,/,e,?]? ^C

Журнал лабораторных работ

Журнал

Понедельник (12/17/18)