SHOW:
|
|
- or go back to the newest paste.
| 1 | - | git checkout --ours . # checkout our local version of all files |
| 1 | + | |
| 2 | - | git add -u # mark all conflicted files as merged |
| 2 | + | |
| 3 | - | git commit # commit the merge |
| 3 | + | |
| 4 | - | --------------------------- |
| 4 | + | |
| 5 | ----------------------------------- | |
| 6 | git init | |
| 7 | ------------ | |
| 8 | git commit -m | |
| 9 | ----------------- | |
| 10 | git reset unwantedstaged.txt | |
| 11 | -------------------------- | |
| 12 | git add | |
| 13 | -------------- | |
| 14 | git push | |
| 15 | -------------- | |
| 16 | git checkout | |
| 17 | ---------------- | |
| 18 | git branch | |
| 19 | ------------- | |
| 20 | git diff | |
| 21 | ---------- | |
| 22 | git remote add origin | |
| 23 | ---------------- | |
| 24 | git log | |
| 25 | ------------ | |
| 26 | git reflog | |
| 27 | ----------------- | |
| 28 | git show -h | |
| 29 | ------------ | |
| 30 | git k | |
| 31 | ----------- | |
| 32 | git status | |
| 33 | ------------ | |
| 34 | git reset | |
| 35 | ------------- | |
| 36 | git fetch upstream | |
| 37 | ------------- | |
| 38 | git merge upstream/master | |
| 39 | -------------------------- | |
| 40 | $ ssh -T [email protected] | |
| 41 | ----------------------------------- | |
| 42 | ssh-add -l | |
| 43 | ----------------------------------- | |
| 44 | git config --global user.name "Example Surname" | |
| 45 | git config --global user.email "[email protected]" | |
| 46 | ----------------------------------------------------- | |
| 47 | git reset --soft HEAD^ | |
| 48 | git reset --hard HEAD in case of commit | |
| 49 | ------------------------------------ | |
| 50 | - | ----------------------------------------------------- |
| 50 | + | git checkout --filename |
| 51 | ---------------------------- | |
| 52 | git reset head --filename in case of staging | |
| 53 | ---------------------------- | |
| 54 | git commit -a -m (add and commit ) | |
| 55 | ---------------------- | |
| 56 | git commit --amend | |
| 57 | ------------------------- |
