× GitFichas is now open-source and undergoing some construction. Thanks for the patience. You can learn more about the changes happening here.

Textually searching

commit

messages

option to show all commits
git
log
--all
--grep='word'
command to
show the history
option to pass the
search term to be found
this command also performs textual search using regex
053 git log --all --grep='word'

Renaming

a file

current file name
git
mv
source
target
command to
move files
new file name
this command can be used to move files between folders
052 git mv source target

Making an empty

commit

option to allow the
creation of an empty commit
git
commit
--allow-empty
command to
manage commits
this command will open a text editor to write the commit message
051 git commit --allow-empty

Pulling

changes

repository from where
to download changes
git
pull
remote
branch
command to
dowload changes
branch to download
changes from
usually both the remote and the branch can be omitted
050 git pull remote branch
#049 git merge source target
#048 git branch -M name
#047 git clone -b name
#046 git stash apply stash@{2}
#045 git stash drop stash@{2}
#044 git stash pop
#043 git stash list
#042 git stash -m “changes”
#041 git stash push
#040 What is stash?
#039 git commit -C ORIG_HEAD
#038 git reset HEAD^ --soft
#037 git reset HEAD^
#036 git reset HEAD~3
#035 git switch -c name
#034 git switch name
#033 git clone url name
#032 git restore name
#031 git commit --amend

What is a

conflict

it happens when two or more changes are made to the
same chunk of a file and git doesn't know
how to apply the most recent change
conflicts are indicated by the markers >>> === <<<
030
#029 git restore --staged name

Using

rebase

to fix branch source

Flag to indicate
the new source
Incorrect branch source
git
rebase
--onto
source
previous
branch
Command to reapply commits
Branch or commit
that should be the source
Branch that
needs correction
028 git rebase --onto source previous branch
#027 git rebase source target
#026 git branch -D name
#025 git branch -d name
#024 git push remote branch
#023 git push --set-upstream remote branch
#022 git remote rename current name
#021 git remote add name url
#020 git remote -v
#019 What is a remote?
#018 git clone url
#017 What is a clone?
#016 What is a fork?
#015 What is a diff?
#014 git checkout -b name
#013 What is HEAD?
#012 git diff
#011 git checkout name

what is a

pull request

It is the process of submitting changes for
review on GitHub
On GitLab, this process is called merge
request
010
#009 git branch name
#008 git add -p
#007 git log
#006 git status

what is the

staging

area

it's the commit setup area
where we see the collection of altered or created files
that will be part of the next commit
005
#004 git show 09c6d68
#003 git commit -m “changes”
#002 git add file.txt
#001 git init