Basic git commands

You can perform git commands for example in:

cmd console (widnows start -> cmd. It should oppened Command Prompt app. To go to the root directory, enter cd \ . Next enter cd + path to directory with your project, e.g. cd Users\ Joanna\Desktop\my-project

git bash console, which you can get from https://git-scm.com/downloads . After installing console go to directory with your project, right click and select: Git Bash Here (then console opens).

If you have your console with path to your project, you can enter first command (step one).

Basic git commands:

I – Basic git commands:

1. Creating a new local repository:

-> git init

In your project catalog it should be created hidden folder .git

2. If you have in your project catalog some files, which you don’t want to add to repository (because you don’t want to send it to github later), you can create .gitignore file, in which you can write paths to this files. Git will skip them when adding files to the repository.

-> touch .gitignore

3. Shows changes that you made in project, e.g. files names, which have changed the content, but have not been added to the stage yet, are displayed in red, and those that have been added to the stage, but no commit has been made, are displayed in green.

-> git status

4. Adding file to stage

-> git add file-name, e.g. git add index.html

-> git add . – dot means, that you add to stage all files from project

5. Removing file from stage:

-> git rm –cached file-name, e.g. git rm –cached index.html

6. Adding commit:

-> git commit -m ”commit message”

7. Viewing commits history (if you want to go back to any previous commit, you need its number. By displaying the history you will see all commits and its numbers):

-> git log <- shows more details

-> git log –oneline <- less details, but more readable

8. Undoing commits

-> git checkout commit-number, e.g. git checkout af6b84c

Shows code from commit in editor. It not removes history and any commits.

If you want to go back to your code enter: git checkout master (if you work on master branch).

-> git revert commit-number, e.g. git revert af6b84c

Deletes changes from the selected commit (e.g. af6b84c) by adding a new commit (e.g. bg6b92d), in which code entered after commit number af6b84c was deleted. It not removes history

-> git reset commit-number, e.g. git reset af6b84c

Deletes commits from repository and removes history (it is not recommended). If you choose to delete third commit from the end, it will remove the last 3 commits from editor, use command:

-> git reset commit-number –hard

II – Remote repository:

As an example, we will use github (github.com)

Create an account on github. You will need to create a new remote repository and provide its name, and description (optional).

Option 1 – You already have a project in the local repository and you want to add it to the remote repository:

9. Github -> create new project -> enter its name and description -> DO NOT check “Initialize this repository with a README” option -> create repository.

10. Adding path to remote repository in local repository. Enter in console:

-> git remote add origin + path to repository on github, egzample: https://github.com/AccountNameGitHub/NameOfProject.git

Together:

-> git remote add origin https://github.com/AccountNameGitHub/NameOfProject.git

Path to the repository you can find on github.

11. Checking path to which are sent files to remote repository:

-> git remote -v

Option 2– You do NOT have a project in any repository yet:

9. Github -> create new project -> enter its name and description -> CHECK “Initialize this repository with a README” option -> create repository.

10. Clone a github repository on your computer (green button “clone or download” on github). Set path to your project in console and enter:

-> git clone + path to repository, e.g.

git clone https://github.com/AccountNameOnGithub/ProjectName.git

Folder with project from github should appear in location that you set in console.

11. Getting changes from github (from remote to local repository). Switch on branch that you want to pull changes. If you use main branch, which is master branch, you do not have to switch.

-> git pull origin branch-name, from which you pull files, e.g. git pull origin master

To options 1 i 2:

12. Add files from local project to remote repository (from computer to github):

-> git push -u origin branch-name, on which you send files. If you have only one branch, the command is:

-> git push -u origin master

You only need to set the -u flag when you send files to remote repository for the first time, or first time after merge. This helps define path to pull files in later time. Each next files upload to github is command:

-> git push origin master

13. Creating a separate branch locally:

-> git branch brach-name , e.g. git branch features/searchBar

14. Show all branches:

-> git branch -a

15. Switch to branch:

-> git checkout branch-name, e.g. git checkout features/searchBar or: git checkout master

16. Creating a branch and switching to it (instead steps 13 i 15):

-> git checkout -b branch-name, e.g. git checkout -b features/searchBar

17. Commit made on branch:

-> git checkout features/searchBar

-> git add .

-> git commit -m “commit message”

Adding a commit from the local repository to the remote one on branch other than master:

-> git push origin features/searchBar

18. Deleting branch. First, switch on master branch:

-> git checkout master

Next enter:

-> git branch -d branch-name, e.g. git branch -d features/searchBar <- this removes branch only if merge with master was made.

-> git branch -D branch-name, e.g. git branch -D features/searchBar <- this removes branch even if merge with master wasn’t made

19. Merge branch. First, switch on master branch:

-> git checkout master

Next enter:

-> git merge branch-name, e.g. git merge features/menu


Get basic git commands in PDF

Download basic_git_commands_en

Joanna

Leave a Reply

Your email address will not be published. Required fields are marked *