Compare commits
5 commits
360cd08c71
...
cd3e53b751
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd3e53b751 | ||
|
|
115d99107c | ||
|
|
b66fc8c46c | ||
|
|
632baf7176 | ||
|
|
5ec4f4adf6 |
2 changed files with 14 additions and 0 deletions
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
|
||||||
Loading…
Add table
Add a link
Reference in a new issue