-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathabc.txt
199 lines (159 loc) · 6.13 KB
/
abc.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
this is github
<<<<<<< HEAD
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s
$ git config --global user.name "Mohammadtej"
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s
$ git cinfig --global user.email "[email protected]"
git: 'cinfig' is not a git command. See 'git --help'.
The most similar command is
config
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s
$ ^C
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s
$ git config --global user.email "[email protected]"
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s
$ git config --list
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/ssl/certs/ca-bundle.crt
core.autocrlf=true
core.fscache=true
core.symlinks=false
pull.rebase=false
credential.helper=manager-core
credential.https://dev.azure.com.usehttppath=true
init.defaultbranch=master
user.name=Mohammadtej
color.ui=true
core.editor=emacs
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s
$ git status
fatal: not a git repository (or any of the parent directories): .git
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s
$ git init
Initialized empty Git repository in C:/Users/91709/Desktop/git_s/.git/
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git status
On branch master
No commits yet
nothing to commit (create/copy files and use "git add" to track)
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git status
On branch master
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
abc.txt
nothing added to commit but untracked files present (use "git add" to track)
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git add .
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git commit -m "this is voila!"
[master (root-commit) b842dfe] this is voila!
1 file changed, 1 insertion(+)
create mode 100644 abc.txt
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git log
commit b842dfe27cd7e2b24e3e15991817316b66dd46b2 (HEAD -> master)
Author: Mohammadtej <[email protected]>
Date: Sat Jan 30 21:52:42 2021 +0530
this is voila!
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git remote add origin https://github.com/Mohammadtej/session.git
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git push -u origin master
Enumerating objects: 3, done.
Counting objects: 100% (3/3), done.
Writing objects: 100% (3/3), 229 bytes | 114.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
To https://github.com/Mohammadtej/session.git
* [new branch] master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 632 bytes | 30.00 KiB/s, done.
From https://github.com/Mohammadtej/session
b842dfe..70a28db master -> origin/master
Updating b842dfe..70a28db
Fast-forward
abc.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git log
commit 70a28db4d12e44c6ee313392040ca4fcc67d587c (HEAD -> master, origin/master)
Author: Mohammadtej <[email protected]>
Date: Sat Jan 30 22:10:43 2021 +0530
Update abc.txt
commit b842dfe27cd7e2b24e3e15991817316b66dd46b2
Author: Mohammadtej <[email protected]>
Date: Sat Jan 30 21:52:42 2021 +0530
this is voila!
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git reset --mixed b842dfe27cd7e2
Unstaged changes after reset:
M abc.txt
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git log
commit b842dfe27cd7e2b24e3e15991817316b66dd46b2 (HEAD -> master)
Author: Mohammadtej <[email protected]>
Date: Sat Jan 30 21:52:42 2021 +0530
this is voila!
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git add .
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git commit -m "just learning"
[master 1b60569] just learning
1 file changed, 1 insertion(+), 1 deletion(-)
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git push
To https://github.com/Mohammadtej/session.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/Mohammadtej/session.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (master)
$ git checkout -b me
Switched to a new branch 'me'
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (me)
$
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (me)
$
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (me)
$ nano abc.txt
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (me)
$ nano abc.txt
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (me)
$ git add .
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (me)
$ git commit -m "a"
[me a9f5d44] a
1 file changed, 1 insertion(+)
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (me)
$ git push --set-upstream origin me
Enumerating objects: 8, done.
Counting objects: 100% (8/8), done.
Delta compression using up to 4 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (6/6), 504 bytes | 100.00 KiB/s, done.
Total 6 (delta 0), reused 0 (delta 0), pack-reused 0
remote:
remote: Create a pull request for 'me' on GitHub by visiting:
remote: https://github.com/Mohammadtej/session/pull/new/me
remote:
To https://github.com/Mohammadtej/session.git
* [new branch] me -> me
Branch 'me' set up to track remote branch 'me' from 'origin'.
ZeeGadgets@DESKTOP-Q5H8D75 MINGW64 ~/Desktop/git_s (me)
$
=======
>>>>>>> 70a28db4d12e44c6ee313392040ca4fcc67d587c