Results: 1022
git fetch
New commits of
origin/master
branch will be downloaded locally with the same name
git fetch origin master
When the commits are downloaded, we can checkout and see if the change is OK to merge
git checkout origin/master
The two commands
git fetch origin master
git merge origin/master
are equivalent to command
git pull
The branch
feature1
will be based on the last commit of the master branch
git rebase master
The branch
feature1
will be based on the commit specified in the command
git rebase 3b06f53
Stages only modified and deleted files
git add -u  /  git add --update
Stages only modified and deleted files inside
my_dir
sub-directory
git add -u my_dir/  /  git add --update my_dir/
-u
is shorthand for
--update
Stages all new and modified files (except deleted - removed files)
git add . --no-all  / git add . --ignore-removal
Should be specified
path
at least
.
--no-all
is the same as
--ignore-removal
so the two commands are identical
The two commands are identical because
git add
defaults to
-A
git add my_dir  /  git add -A my_dir
if we run
git add -A
inside sub-directory, it will stage all of the changes even though some of the changes are up one directory. But
git add .
will only stage all updated, deleted and new files that are inside the sub-directory If we are inside
my_dir
sub-directory, the two commands will do the same
git add .  /  git add -A my_dir/
https://youtu.be/tcd4txbTtAY?t=349
Stages all modified, deleted and new files in the entire working tree
git add --all  /  git add -A
-A
is a short handhand notation for
--all
To set diffmerge as default diff & merge tool for git
We can run
git stash
on one branch and then
git stash pop
on another branch (to commit changes on another branch)
Deletes all stashes
git stash clear
Results: 1022