Compare commits
10 commits
f66e04ce24
...
ddebb519d8
| Author | SHA1 | Date | |
|---|---|---|---|
| ddebb519d8 | |||
| 51ffabbb68 | |||
|
|
884c061146 | ||
| d88dd23a01 | |||
| dafaea2997 | |||
| c13254e9ba | |||
|
|
9cdf3bb3ee | ||
| 851be27fc0 | |||
|
|
c8239b5886 | ||
| 075583d7e0 |
5 changed files with 17 additions and 0 deletions
1
README.md
Normal file
1
README.md
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Hi
|
||||||
13
READMEINSTEAD.md
Normal file
13
READMEINSTEAD.md
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
# Hello World
|
||||||
|
git commit -a -m "Message"
|
||||||
|
This command adds all modified files, but not new ones, to a commit immediately.
|
||||||
|
|
||||||
|
If someone else already commit smth, pull it with
|
||||||
|
git pull -r
|
||||||
|
Now you start resolving conflicts. If there's a conflict, you gotta deal with it. Keep doing that till you're done
|
||||||
|
--> Happiness
|
||||||
|
continue with "git rebase --continue"
|
||||||
|
then you can pmossibly change the commit message
|
||||||
|
then you can push
|
||||||
|
git log
|
||||||
|
exists as a log of what happened
|
||||||
1
anotherfileagain.txt
Normal file
1
anotherfileagain.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
hi there
|
||||||
1
hello.txt
Normal file
1
hello.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
test from cheng
|
||||||
1
hi.txt
Normal file
1
hi.txt
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Hello!
|
||||||
Loading…
Add table
Add a link
Reference in a new issue