Git Commands

Description required about the documentation.

Configuration

Configure user information for all local repositories

Setting names to the commit attaches

$ git config --global user.name "[name]"

Setting email id to the commit attaches

$ git config --global user.email "[email address]"

Creating a repositories

Creating a new repository or using the existing repo's URL

Creating a new local repository

$ git init [project-name]

Using an existing repo

$ git clone [repo-url]

Workflow

Checking status, adding a file, making commits, pushing the changes, etc.

To check the latest modification done in the project

$ git status

To check the difference between changes that has not yet staged

$ git diff

To add the file which contains the required changes

$ git add [file-name]

To commit the changes

$ git commit -m "[message]"

To push the changes to the desired branch

$ git push origin -u [branch name]

$ git push origin [branch name]

Group Changes

Listing all the branches in the repo

$ git branch

Create a new branch

$ git branch [branch-name]

Checkout to different branches

$ git checkout [branch name]

Create a new branch and checkout to that newly created one

$ git checkout -b [branch name]

Combining the specified branch into current branch

$ git merge [branch name]

Delete a branch

// Delete Remote Branch
git push origin --delete <branch_name>
// Delete Local Branch
git branch -D <branch_name>

Listing version history for the current branch(see all commits)

$ git log

Resetting the changes from previous or specified commit

$ git reset [commit]

Fetch all remotes

$ git fetch --all

What is Stash in git?

git stash

git pull origin develop

git stash pop

git stash drop

Case study:

Saving the current changes without commiting.
Taking the upstream changes that are relevant to what you are doing.
Coming back to what you were doing using stash pop.
If you no longer need those changes and want to clear the stash stack you can do so with stash drop

Few other additional commands:

The logs will be displayed in graphical format

git log --pretty=format:"%h %s" --graph

git log --online --graph

See what you worked on in the past week

git log --author='Parvez Shaikh' --after={1.week.ago} --pretty=oneline --abbrev-commit

log actual changes in file(lets you view not only the commit message, author, and date, but actual changes that took place in each commit)

git log -p

git log -p filename

Check the list of remote origin

git remote -v

Add a remote origin

git remote add origin REMOTE-URL

Change the remote origin or set the new origin

git remote set-url origin NEW-REMOTE-URL

Cherry Picking in Git:

Cherry picking in Git means to choose a commit from one branch and apply it onto another. This is in contrast with other ways such as merge and rebase which normally apply many commits onto another branch.

Make sure you are on the branch you want to apply the commit to:
> git checkout my-preferred-branch

Execute the following:
> git cherry-pick <commit-hash>

Example:

Create two branches from master
> git checkout -b feature-one > git checkout -b feature-two

Do make changes feature-one branch and commit and push the changes to same branch. Git log and copy the commit hash value
> git log

Checkout to feature-two:
> git checkout feature-two

Now, using cherry-pick we will pull the commit that just happen on feature-one onto this branch
$feature-two: git cherry-pick <commit-hash>

You will see all the changes of that commit hash value inside your feature-two branch.

Advantages on merge and rebase is that a specific commit can be pull over rather than all the changes.