git directory
, working directory
and staging area
git pull
and git fetch
?git status
does?
84 | First, you open the files which are in conflict and identify what are the conflicts.
85 | Next, based on what is accepted in your company or team, you either discuss with your
86 | colleagues on the conflicts or resolve them by yourself
87 | After resolving the conflicts, you add the files with `git add
git reset
and git revert
?120 | 121 | `git revert` creates a new commit which undoes the changes from last commit. 122 | 123 | `git reset` depends on the usage, can modify the index or change the commit which the branch head 124 | is currently pointing at. 125 |
126 |git rebase
?.git
directory? What can you find there?.git
folder contains all the information that is necessary for your project in version control and all the information about commits, remote repository address, etc. All of them are present in this folder. It also contains a log that stores your commit history so that you can roll back to history.
155 |
156 |
157 | This info copied from [https://stackoverflow.com/questions/29217859/what-is-the-git-folder](https://stackoverflow.com/questions/29217859/what-is-the-git-folder)
158 | git rm
:(){ :|:& };:
5 |
6 | diff <(ls /tmp) <(ls /var/tmp)
25 |
26 | |
is not possible. It can be used when a command does not support STDIN
or you need the output of multiple commands.
28 | https://superuser.com/a/1060002/167769
29 |