Git Archives - scmGalaxy

How to Install and configure Git and GitHub on windows

vikashdev k — Mon, 20 Sep 2021 13:04:07 +0000

Step 01 : Download Git

https://git-scm.com

Step 02 : GitHub

https://github.com

Step 03 : Create new Repositories

Step 04 : Open Git Bash

Create folder name:- First in ” C local disk”.

Step 05 : Configure

Step 06 : Create files inside FirstGit and commit, upload in account

Like :- test.txt file inside FirstGit

Open txt file and type some text like :- “This is my first work”.

Step 07 : Upload this file to GitHub

Step 08 : Commit and upload

# Note : Refresh Page.

Step 09 : Change in txt file and push

Change in txt file like :-

This is my first work
This is my first work
This is my first work
This is my first work
This is my first work

Save file.

Refresh Page.

The post How to Install and configure Git and GitHub on windows appeared first on scmGalaxy.

Top 10 Website to Host Git Repository Online

narayan k — Sat, 07 Aug 2021 11:58:08 +0000

In any industry, code has become one of the most business-critical assets. As a result, storing, securing, and collaborating around code has become a significant challenge for enterprises large and small.

Choosing the right source code management solution is no easy task. Even more so when you think about hosting your code behind your own firewall.

This post takes you through this decision – starting with a few common questions.

One of the first questions you’ll need to answer for yourself is: do you have the resources and expertise to professionally manage your code’s on-premises hosting?

1. Is On-Premise Hosting the Right Choice for You?

Any IT department must follow strict security policies. If your organization’s policies require you to keep your code in-house, then of course you will have to deal with hosting your code behind your firewall.

However, self-hosting your code is not a decision you should rush. There is much to keep in mind.

Security:

In an on-premises scenario, your IT department is responsible for setting up a secure environment and installing relevant updates consistently. Keeping a server secure and properly maintained is nothing to be taken lightly.

Availability / Backups:

Today, the code is important to many areas within the company. Therefore its permanent availability is often important. You should make sure that your server has little or no downtime.

Also, note that losing code can be a life-threatening event for many enterprises. You need to provide a completely fail-safe and complete backup strategy in order to make data loss impossible.

Integrations:

Also, think about other systems that need to interact with your code repository. Things like continuous integration servers or issue tracking systems can be other important parts of your software cycle.

Make sure they can be integrated with your code hosting platform – whether it’s behind a firewall or in the cloud.

Budget:

Depending on your needs, the size of your team, and the number of repositories, different solutions come at wildly different prices. This is true for both self-hosted installations and online services. You need to make sure that your own IT department can handle core subjects like security and maintenance flawlessly.

2. Commercial or OpenSource?

As of today, almost all source code hosting options are commercial systems. In fact, the main argument for paying a really high price sometimes is the professional support that it includes. For further updates in case of problems/queries, you can count on the professionals who help you.

If you don’t need these services, you can consider an open-source solution.

3. Complementing Tools

As with most solutions, the actual task of “source code management” is only part of their offering. This makes sense if you consider that today, software development involves a myriad of different tools and workflows – the ones that work best when tightly integrated with one another. Think issue tracking, code reviews, continuous integration systems, etc.

Here is the list of Top 10 Website to Host Git Repository Online:

1. Amazon AWS CodeCommit:

Amazon’s AWS platform includes hosting for Git repositories. It also comes with features that facilitate collaboration, such as code review and access control.

AWS CodeCommit is a secure, highly scalable, managed source control service that hosts private Git repositories. It makes it easy for teams to collaborate on code securely, including encrypted contributions in transit and at rest. CodeCommit eliminates the need for you to manage your own source control system or worry about scaling up its infrastructure. You can use CodeCommit to store anything from code to binaries. It supports the standard functionality of Git, so it works seamlessly with your existing Git-based tools.

Benefits:

Fully managed
Secure
High availability
Faster development lifecycle
Use your existing tools
Collaborate on code

2. Assembla:

Assembla has a long history in the business with its Subversion hosting. It includes a “workspace” platform with issue management, time tracking, and collaboration tools such as Wiki and its own messaging system.

It is a source code management tool that specializes in providing cloud-based version control services for code projects and agile software development. They provide an additional project management tool for those who use their cloud repositories.

Features:

Work together with Git merge requests
Collaboration
Integrated Issue Tracking
Security
Package Management
Project Management
Code Analysis

3. Beanstalk:

Being a very lean and reliable service, Beanstalk is a great option for businesses. It provides its own “deployment” infrastructure and integrates well with other tools such as Zendesk, FogBugz, Basecamp, or Lighthouse.

Features:

Easy-to-use service for deploying.
Scaling web applications
Services developed with Java
Backup / Recovery
Development Environment
Testing

4. Bitbucket:

Bitbucket, one of the giants in the industry.

The biggest advantage of Bitbucket Server is certainly that it comes from Atlassian – the company that develops highly popular products like JIRA and Confluence. This is why the integration with these tools (especially JIRA) in BitBucket Server is seamless.

BitBucket Server is an obvious choice if your development toolchain already relies on other Atlassian products like JIRA and Bamboo.

Features:

Merge Checks.
Code search
Git Large File Storage
Bitbucket Pipelines
IP whitelisting.

5. Codebase:

One of the few platforms to support Git, Subversion, and Mercurial. Additionally, ticketing, project management, and deployment infrastructure tools are included. The codebase is packed with features to help you manage your code and your project with ease.

Features:

Repository Hosting
Exception Tracking
Time Tracking
Customizable Permissions
Complete Developer API
Powerful Searching & Filtering
Custom Branding

6. RhodeCode:

Sophisticated code review and approval system including news feed and mention system. With features like LDAP support and IP restrictions, Roadcode seems to be geared for corporate use.

Roadcode allows developers to use not only Git but Mercurial and Subversion for revision control. Feature-wise, the platform offers the most important collaboration features such as code reviews and pull requests – but banks on flexible integration with external tools for both issue tracking and continuous integration.

Features:

Advanced code reviews.
Side-by-side diffs.
Pull requests.
Inline source code chat.
Full-text code search and source code indexing.
Web-based file adding, editing, deletion.

7. SourceForge:

SourceForge is an open-source community resource that is dedicated to helping you succeed as much as possible in open-source projects. We thrive on community collaboration to help make it a premier resource for open-source software development and distribution.

A classic hosting site whose reputation took a turn for the worse in the early 2010s after some shady practices, SourceForge has been under new ownership since 2016 and is determined to restore its good reputation.

Features:

Unlimited bandwidth for Open Source projects
Integrated Issue Tracking
Spambot protection
Extensive worldwide mirror network
Download statistics over time, by platform, and by region.
Analytics is completely free, takes no time to set up.
Automatic platform detection

8. Perforce Helix:

Perforce has the longest history in source code management of all the companies in this overview. It is mostly known for having an impressive tradition in enterprise code hosting through its own Perforce version control system. Recently, however, the company expanded its offering with its new Helix4Git platform.

Features:

Security and scalability
By mirroring work into a Perforce server
Specific branches and files can be locked

Especially will large companies appreciate the long-term experience Perforce as source code management provider; Enterprises can ensure that is well understood their needs and requirements.

9. GitHub:

GitHub is an increasingly popular programming resource that is used to share the access code. It is a social networking site for programmers that use a large range of companies and organizations’ project management and collaboration.

Undisputed number one in the open-source world is having projects like Ruby on Rails or jQuery hosted on GitHub. Offerings include great code review and collaboration features.

Features:

Drag and Drop Gist Code.
Creating a folder via the Web Interface
Using Git URL Shortener.
Task Checklist.
Using Github Command Line Interface.

10. GitLab:

GitLab is a web-based Git repository that offers free open and private repositories, issue-following capabilities, and wikis. This is a full DevOps platform that enables all tasks to professionals from the project planning and source code management, monitoring, and security. It allows teams to collaborate and build better software.

With open-source background, GitLab code provides the perfect platform to develop at a rapid pace for cooperation. The free Community Edition and Enterprise Edition can be installed on your own servers. A hosted offering running on GitLab.com is also available.

Features:

Offers git repository management.
Code Reviews
Issue tracking
Activity feeds and wikis

GitLab teams product helps increase reducing lifecycle and productivity, which creates value for customers return.

There’s a good chance that one of these solutions is the perfect choice for your requirements.

The post Top 10 Website to Host Git Repository Online appeared first on scmGalaxy.

Git Commands Tutorials and Example: Git Reset – Git Revert

Ashwani Kumar — Thu, 05 Aug 2021 12:16:06 +0000

A committed snapshot can be undone with the git reverse command. Rather than removing the commit from the project history, it determines how to reverse the modifications made by the commit and adds a new commit with the resulting content. This prevents Git from losing history, which is critical for maintaining the integrity of your revision history and collaborating with confidence.

Reverting vs. Resetting:-

`git revert`

It’s crucial to note that git revert just undoes a single commit; it doesn’t “revert” a project to its prior state by deleting all future commits. This is referred to as a reset rather than a revert in Git.

Compared to resetting, reverting offers two significant advantages. It is a “safe” action for commits that have already been published to a shared repository since it does not affect the project history. Please check the git reset page for further information on why changing shared history is harmful.

Second, although git reset can only go backwards from the current commit, git revert can target a specific commit at any time in the history. If you wanted to undo an old commit with git reset, for example, you’d have to erase all commits that came after the target commit, then remove the target commit and re-commit all subsequent commits. Needless to say, this isn’t a really elegant undo method.

`git reset`

If git revert is the “safe” approach to reverse changes, git reset may be considered the “dangerous” alternative. There is no way to recover the original copy when you undo with git reset (and the commits are no longer referenced by any ref or the reflog). When using this tool, be cautious because it’s one of the few Git commands that might cause you to lose your work.

What are Uses of:-

`git reset`:-

The selected file will be removed from the staging area, but the working directory will remain unaltered. This removes a file off the stage without overwriting any modifications.
The staging area should be reset to reflect the most recent commit, but the working directory should remain untouched. This upstages all files without overwriting any modifications, allowing you to re-create the staged snapshot from the ground up.
Back up the current branch tip to and reset the staging area to match, but don’t touch the working directory. Since then, all changes have been saved in the working directory, allowing you to re-commit the project history with cleaner, more atomic snapshots.

`git reset –hard`:-

To match the most current commit, reset the staging area and working directory. The –hard flag tells Git to overwrite all changes in the working directory, in addition to upstaging modifications. To put it another way, this deletes any uncommitted modifications, so make sure you truly want to get rid of your local changes before using it.
Reset both the staging area and the working directory to reflect the current branch tip’s position. This removes not just the uncommitted modifications, but also all subsequent commits.

The post Git Commands Tutorials and Example: Git Reset – Git Revert appeared first on scmGalaxy.

Top 5 Git Version Control Software in Cloud

narayan k — Sat, 31 Jul 2021 10:16:24 +0000

Version control is a way to keep track of changes to code so that if something goes wrong, we can compare across different code versions and go back to any previous versions we want. This is very essential where many developers are constantly working on/changing the source code.

Benefits of Version Control Software:

The main advantages of using version control software include streamlining the development process, managing the code for multiple projects, and keeping a history of all changes within a code.

A version control software saves all the changes in a repository. So, if developers make a mistake, they can undo it. Also, they can compare the new code with the previous version to resolve their grievance. It can reduce human errors and unintended consequences to a great extent. Very suitable for any web development company around the world.

In addition, it facilitates the management of the project’s centralized repository, file storage, documents, and other information related to the project.

Here is the list of Top 4 git version control software in cloud:

1. GitHUb

GitHub helps software teams collaborate and maintain a full history of code changes. You can track changes in the code, turn back the clock to undo errors, and share your efforts with other team members.

It is a repository for host Git projects. For those wondering what is Git? It is an open-source version control system with local branching, multiple workflows, and convenient staging areas. Git version control is an easy-to-learn alternative and provides faster operation speeds.

Features:

Drag and Drop Gist Code.
Creating a folder via the Web Interface.
Using Github Command Line Interface.
Linking Lines.

2. GitLab

GitLab comes with a number of useful features such as an integrated project, a project website, etc. By using GitLab’s continuous integration (CI) capabilities, you can test and distribute code automatically.

You can access all aspects of a project, view the code, receive requests and add conflict resolution.

This version control software is designed for the DevOps lifecycle. Meaning, your projects are quite complex and involve cloud engineering and the like. Gitlab provides basic features such as view code, pull requests, and merge resolution.

Development.
Security.
Ops teams collaborate
Build software
Reduce development costs

4. Beanstalk

Beanstalk is a perfect choice for those who need to work from remote locations. This software is based on browser and cloud, which allows users to code, commit, review and deploy using the browser.

It allows users to code, commit, review, and deploy code using the browser. For its ease of use, you can integrate it with any messaging or email platform for efficient collaboration.

It can be integrated with messaging and email platforms for efficient collaboration regarding code and updates. It supports both Git and SVN and also comes with built-in analytics features. For security, it takes advantage of encryption, two-factor authentication, and password protection functions.

Features:

Variety of Application Deployment Options.
Wide Selection of Application Platforms.
Management and Updates.
Customization
Scaling
Compliance

4. HelixCore

Helix is one of the best version control systems. It provides an integrated platform for collaborative development and protection of intellectual property of any kind. It benefits from several new capabilities, support for both distributed and centralized development workflows. Helix also provides a complete Git ecosystem. And it comes in both on-premises and cloud versions.

Helixcore provides seamless team collaboration and support for both centralized and distributed development workflows. It is available for both cloud and on-premises deployments, which makes it scalable.

Features:

Work order management
Applications Management
Document Management
Access Controls
Procurement Management

5. Apache Subversion

Apache Subversion is another open-source version control system, founded a few decades ago by CollabNet. Both open-source arenas and enterprises consider it a reliable option for valuable data.

SVN is easy to implement with any programming language. Also, it provides persistent storage for handling text and binary files.

Features:

Inventory management
Security management
History tracking
User access controls
Data recovery
Workflow management

These are the best version control systems that a web development company should definitely consider using, according to the requirements.

The post Top 5 Git Version Control Software in Cloud appeared first on scmGalaxy.

List of Top 5 Git repository management systems in 2021

vikashdev k — Tue, 27 Jul 2021 10:11:37 +0000

GitHub.
Bitbucket.
Assembla.
RhodeCode.
DevZing Subversion.

GitHub:-

Github is a collaborative coding tool with version control, branching, and merging all included.

GitHub is the best place to share code with friends, co-workers, classmates, and strangers.

Bitbucket:-

Bitbucket is a cloud-based Git and Mercurial-based source code management and collaboration tool.

Bitbucket is a cloud-based hosting service for projects that use either the Mercurial or Git revision control systems.

Assembla:-

Enterprise cloud version control for secure source code management in the cloud.

Assembla is the world’s only Enterprise Cloud Version Control (ECVC) provider, bringing multi-repository secure source code management to the cloud.

RhodeCode:-

RhodeCode is a fast and powerful management tool for Mercurial and GITand SVN with a built-in push/pull server, full-text search, pull requests, and code-review system.

RhodeCode is a fast and powerful management tool for Mercurial and GIT and Subversion with a built-in push/pull server, full-text search, pull requests, and powerful code-review system. It works on http/https and has a range of unique features.

DevZing Subversion:-

High-speed, secure, available subversion hosting.

Your code is safe and secure and accessible from anywhere.

All plans support SSL (https) for connecting to your repositories.

Free import from other Subversion systems. Friction-free migration.

Send an email on every commit. Always know who is updating your repositories.

What is git?

Git is software for tracking changes in any set of files, usually used for coordinating work among programmers collaboratively developing source code during software development. Its goals include speed, data integrity, and support for distributed, non-linear workflows.

Why do we need git?

Git is the most commonly used version control system. Git tracks the changes you make to files, so you have a record of what has been done, and you can revert to specific versions should you ever need to. Git also makes collaboration easier, allowing changes by multiple people to all to be merged into one source.

What is the role of Git repository managment systems?

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with features like cheap local branching, convenient staging areas, and multiple workflows.
A Git repository is the . git/ folder inside a project.
This repository tracks all changes made to files in your project, building a history over time.

The post List of Top 5 Git repository management systems in 2021 appeared first on scmGalaxy.

Enforce the JIRA issue id in a GIT commit message

scmgalaxy K — Wed, 22 Aug 2018 14:21:59 +0000

Enforce the JIRA issue id in a GIT commit message

This can be done by using git hooks file location at .git/hooks/commit-msg. Following are the 2 way in whcih each Developers can set the Hooks in their developement envioronment.

Method – 1

# commit-msg.sh
#!/bin/sh
# This hook will make sure that the commit message contains a JIRA issue.
#
# To enable this hook, rename this file to ".git/hooks/commit-msg".
# Make sure to add execution permissions to the file.

export MESSAGE=$(<$1)
export JIRA_ISSUE_TAG='ISSUETAG-([0-9]*)'

if [[ $MESSAGE =~ $JIRA_ISSUE_TAG ]]; then
echo -e "\e[32mGreat, your commit message contains a JIRA issue!\e[0m"
exit 0;
fi

echo -e "\e[31mOh hamburgers ... You forgot to add a JIRA issue number!\e[0m";
exit 1;

Method 2 – This is another very good example to implement to force jira id in each commit message. http://nsbogan.com/tools/2015/06/04/jira-id-in-git-commit-messages

The post Enforce the JIRA issue id in a GIT commit message appeared first on scmGalaxy.

Best Branching and Merging strategies in git

scmgalaxy K — Wed, 22 Aug 2018 13:51:49 +0000

Best Branching and Merging strategies in git

Step 1 – First you need to learn the needs of branches. This is very good read.

https://docs.microsoft.com/en-us/vsts/repos/tfvc/branching-strategies-with-tfvc?view=vsts

Step 2 – Now time has come to Learn best branching model in Git.

https://buddy.works/blog/5-types-of-git-workflows
https://hackernoon.com/a-branching-and-releasing-strategy-that-fits-github-flow-be1b6c48eca2
https://nvie.com/posts/a-successful-git-branching-model/

Step 3 – Now, Lets understand, what is the kind of merges we have in Git?

https://www.atlassian.com/git/tutorials/using-branches/git-merge
https://git-scm.com/docs/merge-strategies
https://stackoverflow.com/questions/366860/when-would-you-use-the-different-git-merge-strategies

Step 4 – Are you still having a questions, Please post in the comment section.

The post Best Branching and Merging strategies in git appeared first on scmGalaxy.

How to update or pull current branch before committing in Git?

scmgalaxy K — Wed, 22 Aug 2018 10:51:53 +0000

Best practice says that before you commit in git, you need to either do git pull or git fetch/merge. However, there is a way to find out wheather your branches is not in sync with remote.

To check the remote repo status you are really simulating a “fetch”
$ git fetch -v –dry-run

To bring your remote refs up to date
$ git remote -v update

This command will print whether the branch you are tracking is ahead, behind or has diverged with remote. If it says nothing, the local and remote are the same.
$ git status -uno

To pull
$ git pull origin <>
or
$ git fetch origin <>
$ git merge remote/<>
$ git commit

Compare the two branches:
$ git log HEAD..origin/master –oneline

The post How to update or pull current branch before committing in Git? appeared first on scmGalaxy.

Git Lab & Excercise

scmgalaxy K — Tue, 09 Jan 2018 12:04:50 +0000

Hello Everyone,

Please find git Lab and excercise session which has 5 sets to practice the git.

If you want to add any new addition, do let me know in comment section.

Git Lab & Excercise

The post Git Lab & Excercise appeared first on scmGalaxy.

Git Interview Questions and Answer

scmgalaxy K — Wed, 19 Apr 2017 20:10:39 +0000

Q1. What is GIT?

Git is a distributed version control system and source code management (SCM) system with focus to handle small and large projects source code versions in the local repository with speed and efficiency. It is free and open source and its one of widly used versioning tools used ever worldwide.

Q2. What do you understant the repository in Git?

A repository in git, consists of .git directory which contains the each source code commited in form of objects created using SHA1 algorithms. A .git directry where git keeps all of its metadata for the source code in objects forms. It also contains the git configuration file, breanch reference and staging state of the work space.

Q. What is the command you can use to write a commit message?

The command that is used to write a commit message is “git commit –m”this is reason for commit”. The –a on the command line instructs git to commit the new content of all tracked files that have been modified. You can use “git add ” before git commit –a if new files need to be committed for the first time.

In nutshell, any new changes has to added from working directory to stageing area and then commit from staging area to reposiory. Please refer the image for the same as below;

Q. What is the difference between GIT and SVN?

The difference between GIT and SVN is

Git is less preferred for handling extremely large files or frequently changing binary files while SVN can handle multiple projects stored in the same repository.
GIT does not support ‘commits’ across multiple branches or tags. Subversion allows the creation of folders at any location in the repository layout.
Gits are unchangeable, while Subversion allows committers to treat a tag as a branch and to create multiple revisions under a tag root.

Q. What are the advantages of using GIT?

Data redundancy and replication
High availability
Only one.git directory per repository
Superior disk utilization and network performance
Collaboration friendly
Any sort of projects can use GIT

Q. What language is used in GIT?

GIT is fast, and ‘C’ language makes this possible by reducing the overhead of runtimes associated with higher languages.

Q. What is the function of ‘GIT PUSH’ in GIT?

‘GIT PUSH’ updates remote refs along with associated objects.

Q. Why GIT better than Subversion?

GIT is an open source version control system; it will allow you to run ‘versions’ of a project, which show the changes that were made to the code overtime also it allows you keep the backtrack if necessary and undo those changes. Multiple developers can checkout, and upload changes and each change can then be attributed to a specific developer.

Q. What is “Staging Area” or “Index” in GIT?

Before completing the commits, it can be formatted and reviewed in an intermediate area known as ‘Staging Area’ or ‘Index’.

Q. What is GIT stash?

GIT stash takes the current state of the working directory and index and puts in on the stack for later and gives you back a clean working directory. So in case if you are in the middle of something and need to jump over to the other job, and at the same time you don’t want to lose your current edits then you can use GIT stash.

Q. What is GIT stash drop?

When you are done with the stashed item or want to remove it from the list, run the git ‘stash drop’ command. It will remove the last added stash item by default, and it can also remove a specific item if you include as an argument.

Q. How will you know in GIT if a branch has been already merged into master?

Git branch—merged lists the branches that have been merged into the current branch

Git branch—no merged lists the branches that have not been merged

Q. is the function of git clone?

The git clone command creates a copy of an existing Git repository. To get the copy of a central repository, ‘cloning’ is the most common way used by programmers.

Q. What is the function of ‘git config’?

The ‘git config’ command is a convenient way to set configuration options for your Git installation. Behaviour of a repository, user info, preferences etc. can be defined through this command.

Q. What does commit object contain?

A set of files, representing the state of a project at a given point of time
Reference to parent commit objects
An SHAI name, a 40 character string that uniquely identifies the commit object.

Q. How can you create a repository in Git?

In Git, to create a repository, create a directory for the project if it does not exist, and then run command “git init”. By running this command .git directory will be created in the project directory, the directory does not need to be empty.

Q. What is ‘head’ in git and how many heads can be created in a repository?

A ‘head’ is simply a reference to a commit object. In every repository, there is a default head referred as “Master”. A repository can contain any number of heads.

Q. What is the purpose of branching in GIT?

The purpose of branching in GIT is that you can create your own branch and jump between those branches. It will allow you to go to your previous work keeping your recent work intact.

Q. What is the common branching pattern in GIT?

The common way of creating branch in GIT is to maintain one as “Main“

branch and create another branch to implement new features. This pattern is particularly useful when there are multiple developers working on a single project.

Q. How can you bring a new feature in the main branch?

To bring a new feature in the main branch, you can use a command “git merge” or “git pull command”.

Q. What is a ‘conflict’ in git?

A ‘conflict’ arises when the commit that has to be merged has some change in one place, and the current commit also has a change at the same place. Git will not be able to predict which change should take precedence.

Q. How can conflict in git resolved?

To resolve the conflict in git, edit the files to fix the conflicting changes and then add the resolved files by running “git add” after that to commit the repaired merge, run “git commit”. Git remembers that you are in the middle of a merger, so it sets the parents of the commit correctly.

Q. To delete a branch what is the command that is used?

Once your development branch is merged into the main branch, you don’t need development branch. To delete a branch use, the command “git branch –d [head]”.

Q. What is another option for merging in git?

“Rebasing” is an alternative to merging in git.

Q. What is the syntax for “Rebasing” in Git?

The syntax used for rebase is “git rebase [new-commit] “

Q. What is the difference between ‘git remote’ and ‘git clone’?

‘git remote add’ just creates an entry in your git config that specifies a name for a particular URL. While, ‘git clone’ creates a new git repository by copying and existing one located at the URI.

Q. What is GIT version control?

With the help of GIT version control, you can track the history of a collection of files and includes the functionality to revert the collection of files to another version. Each version captures a snapshot of the file system at a certain point of time. A collection of files and their complete history are stored in a repository.

Q. Mention some of the best graphical GIT client for LINUX?

Some of the best GIT client for LINUX is

Git Cola
Git-g
Smart git
Giggle
Git GUI
qGit

Q. What is Subgit? Why to use Subgit?

‘Subgit’ is a tool for a smooth, stress-free SVN to Git migration. Subgit is a solution for a company -wide migration from SVN to Git that is:

a) It is much better than git-svn

b) No requirement to change the infrastructure that is already placed

c) Allows to use all git and all sub-version features

d) Provides genuine stress –free migration experience.

Q. What is the function of ‘git diff ’ in git?

‘git diff ’ shows the changes between commits, commit and working tree etc.

Q. What is ‘git status’ is used for?

As ‘Git Status’ shows you the difference between the working directory and the index, it is helpful in understanding a git more comprehensively.

Q. What is the difference between the ‘git diff ’and ‘git status’?

‘git diff’ is similar to ‘git status’, but it shows the differences between various commits and also between the working directory and index.

Q. What is the function of ‘git checkout’ in git?

A ‘git checkout’ command is used to update directories or specific files in your working tree with those from another branch without merging it in the whole branch.

Q. What is the function of ‘git rm’?

To remove the file from the staging area and also off your disk ‘git rm’ is used.

Q. What is the function of ‘git stash apply’?

When you want to continue working where you have left your work, ‘git stash apply’ command is used to bring back the saved changes onto the working directory.

Q. What is the use of ‘git log’?

To find specific commits in your project history- by author, date, content or history ‘git log’ is used.

Q. What is ‘git add’ is used for?

‘git add’ adds file changes in your existing directory to your index.

Q. What is the function of ‘git reset’?

The function of ‘Git Reset’ is to reset your index as well as the working directory to the state of your last commit.

Q. What is git Is-tree?

‘git Is-tree’ represents a tree object including the mode and the name of each item and the SHA-1 value of the blob or the tree.

Q. How git instaweb is used?

‘Git Instaweb’ automatically directs a web browser and runs webserver with an interface into your local repository.

Q. What does ‘hooks’ consist of in git?

This directory consists of Shell scripts which are activated after running the corresponding Git commands. For example, git will try to execute the post-commit script after you run a commit.

Q. Explain what is commit message?

Commit message is a feature of git which appears when you commit a change. Git provides you a text editor where you can enter the modifications made in commits.

Q. How can you fix a broken commit?

To fix any broken commit, you will use the command “git commit—amend”. By running this command, you can fix the broken commit message in the editor.

Q. Why is it advisable to create an additional commit rather than amending an existing commit?

There are couple of reason

The amend operation will destroy the state that was previously saved in a commit. If it’s just the commit message being changed then that’s not an issue. But if the contents are being amended then chances of eliminating something important remains more.
Abusing “git commit- amend” can cause a small commit to grow and acquire unrelated changes.

Q. What is ‘bare repository’ in GIT?

To co-ordinate with the distributed development and developers team, especially when you are working on a project from multiple computers ‘Bare Repository’ is used. A bare repository comprises of a version history of your code.

Q. How do you revert a commit that has already been pushed and made public?

One or more commits can be reverted through the use of git revert. This command, in essence, creates a new commit with patches that cancel out the changes introduced in specific commits. In case the commit that needs to be reverted has already been published or changing the repository history is not an option, git revert can be used to revert commits. Running the following command will revert the last two commits:

git revert HEAD~2..HEAD

Alternatively, one can always checkout the state of a particular commit from the past, and commit it anew.

Q. How do you squash last N commits into a single commit?

Squashing multiple commits into a single commit will overwrite history, and should be done with caution. However, this is useful when working in feature branches. To squash the last N commits of the current branch, run the following command (with {N} replaced with the number of commits that you want to squash):

git rebase -i HEAD~{N}

Upon running this command, an editor will open with a list of these N commit messages, one per line. Each of these lines will begin with the word “pick”. Replacing “pick” with “squash” or “s” will tell Git to combine the commit with the commit before it. To combine all N commits into one, set every commit in the list to be squash except the first one. Upon exiting the editor, and if no conflict arises, git rebase will allow you to create a new commit message for the new combined commit.

Q. How do you find a list of files that has changed in a particular commit?

git diff-tree -r {hash}

Given the commit hash, this will list all the files that were changed or added in that commit. The -r flag makes the command list individual files, rather than collapsing them into root directory names only.

The output will also include some extra information, which can be easily suppressed by including a couple of flags:

git diff-tree –no-commit-id –name-only -r {hash}

Here –no-commit-id will supress the commit hashes from appearing in the output, and –name-only will only print the file names, instead of their paths.

Q. How do you setup a script to run every time a repository receives new commits through push?

To configure a script to run every time a repository receives new commits through push, one needs to define either a pre-receive, update, or a post-receive hook depending on when exactly the script needs to be triggered.

Pre-receive hook in the destination repository is invoked when commits are pushed to it. Any script bound to this hook will be executed before any references are updated. This is a useful hook to run scripts that help enforce development policies.

Update hook works in a similar manner to pre-receive hook, and is also triggered before any updates are actually made. However, the update hook is called once for every commit that has been pushed to the destination repository.

Finally, post-receive hook in the repository is invoked after the updates have been accepted into the destination repository. This is an ideal place to configure simple deployment scripts, invoke some continuous integration systems, dispatch notification emails to repository maintainers, etc.

Hooks are local to every Git repository and are not versioned. Scripts can either be created within the hooks directory inside the “.git” directory, or they can be created elsewhere and links to those scripts can be placed within the directory.

Q. What is git bisect? How can you use it to determine the source of a (regression) bug?

Git provides a rather efficient mechanism to find bad commits. Instead of making the user try out every single commit to find out the first one that introduced some particular issue into the code, git bisect allows the user to perform a sort of binary search on the entire history of a repository.

By issuing the command git bisect start, the repository enters bisect mode. After this, all you have to do is identify a bad and a good commit:

git bisect bad # marks the current version as bad

git bisect good {hash or tag} # marks the given hash or tag as good, ideally of some earlier commit

Once this is done, Git will then have a range of commits that it needs to explore. At every step, it will checkout a certain commit from this range, and require you to identify it as good or bad. After which the range will be effectively halved, and the whole search will require a lot less number of steps than the actual number of commits involved in the range. Once the first bad commit has been found, or the bisect mode needs to be ended, the following command can be used to exit the mode and reset the bisection state:

git bisect reset

Q. What are the different ways you can refer to a commit?

In Git each commit is given a unique hash. These hashes can be used to identify the corresponding commits in various scenarios (such as while trying to checkout a particular state of the code using the git checkout {hash} command).

Additionally, Git also maintains a number of aliases to certain commits, known as refs. Also, every tag that you create in the repository effectively becomes a ref (and that is exactly why you can use tags instead of commit hashes in various git commands). Git also maintains a number of special aliases that change based on the state of the repository, such as HEAD, FETCH_HEAD, MERGE_HEAD, etc.

Git also allows commits to be referred as relative to one another. For example, HEAD~1 refers to the commit parent to HEAD, HEAD~2 refers to the grandparent of HEAD, and so on. In case of merge commits, where the commit has two parents, ^ can be used to select one of the two parents, e.g. HEAD^2 can be used to follow the second parent.

And finally, refspecs. These are used to map local and remote branches together. However, these can be used to refer to commits that reside on remote branches allowing one to control and manipulate them from a local Git environment.

Q. What is git rebase and how can it be used to resolve conflicts in a feature branch before merge?

In simple words, git rebase allows one to move the first commit of a branch to a new starting location. For example, if a feature branch was created from master, and since then the master branch has received new commits, git rebase can be used to move the feature branch to the tip of master. The command effectively will replay the changes made in the feature branch at the tip of master, allowing conflicts to be resolved in the process. When done with care, this will allow the feature branch to be merged into master with relative ease and sometimes as a simple fast-forward operation.

Q. How do you configure a Git repository to run code sanity checking tools right before making commits, and preventing them if the test fails?

This can be done with a simple script bound to the pre-commit hook of the repository. The pre-commit hook is triggered right before a commit is made, even before you are required to enter a commit message. In this script one can run other tools, such as linters and perform sanity checks on the changes being committed into the repository. For example, the following script:

#!/bin/sh
files=$(git diff –cached –name-only –diff-filter=ACM | grep ‘.go$’)
if [ -z files ]; then
exit 0
fi
unfmtd=$(gofmt -l $files)
if [ -z unfmtd ]; then
exit 0
fi
echo “Some .go files are not fmt’d”
exit 1

… checks to see if any .go file that is about to be commited needs to be passed through the standard Go source code formatting tool gofmt. By exiting with a non-zero status, the script effectively prevents the commit from being applied to the repository.

The post Git Interview Questions and Answer appeared first on scmGalaxy.

How to build when a change is pushed to GitHub in Jenkins?

scmgalaxy K — Sun, 15 Jan 2017 02:30:34 +0000

The GitHub plugin for Jenkins is the most basic plugin for integrating Jenkins with GitHub projects. If you are a GitHub user, this plugin enables you to:

Schedule your build
Pull your code and data files from your GitHub repository to your Jenkins machine
Automatically trigger each build on the Jenkins server, after each Commit on your Git repository

This saves you time and lets you incorporate your project into the Continuous Integration (CI) process.

How to Start Working with the GitHub Plugin for Jenkins

Install the Github Jenkins plugin

Go to “Manage Jenkins” –> “Manage Plugins” –> “Available” Tab –> Search for “GitHub plugin” and install it.

Configure the plugin with github accounts and keys

Go to “Manage Jenkins” –> “Configure System” –> Locate “Github” section and “Add Github Server”.

API URL – If you server is github.com, your “API URL” would be “https://api.github.com” Otherwise if you use GitHub Enterprise, specify its API endpoint here (e.g., https://ghe.acme.com/api/v3/).

Credentials – You can create your own personal access token in your account GitHub settings.

Token should be registered with scopes: Refer https://github.com/settings/tokens/new.

Add credentials (your Github token), Apply and “Test Connection”.

Open your Jenkins Project

a) Check the GitHub project checkbox and set the Project URL to point to your GitHub Repository

b) Under Source Code Management, check Git and set the Repository URL to point to your GitHub Repository

c) Under Build Triggers, check the “Build when a change is pushed to GitHub” checkbox

4. Install the Jenkins (GitHub plugin) and set a webhook to your Jenkins machine

a) From your GitHub repository, go to Settings and then to Integrations & Services

b) Click on Add Service and add ‘Jenkins (GitHub plugin)’

c) Set the Jenkins hook URL as the URL for your Jenkins machine, and add /github-webhook/

Congratulations! Every time you publish your changes to Github, GitHub will trigger your new Jenkins job.

Another Approach noted by suprakash

Actually if you do the web hook settings from Jenkins -> Github plugin configuration (mentioned above), you will still see webhooks get created in github. So , above two approaches basically doing the same thing.

I personally like it to create webhook from Github, because in this way you don’t have to share or store github user info in jenkins.

Steps : 1. Login into Github (with Admin) 2. Go to the repository you want to hook with jenkins 3. Click on settings tab -> webhooks & services 4. Click on Add Webhook 5. Enter payload url : like : http://:8080/github-webhook/ 6. Select content type as json 7. you are done

Now you do the changes and commit , you will see jenkins build get trigger automatically. Don’t forget to do the settings in jenkins jobs to start the build when push code in github.

Reference

https://www.blazemeter.com/blog/how-start-working-github-plugin-jenkins

https://wiki.jenkins-ci.org/display/JENKINS/GitHub+Plugin

http://stackoverflow.com/questions/30576881/jenkins-build-when-a-change-is-pushed-to-github-option-is-not-working

The post How to build when a change is pushed to GitHub in Jenkins? appeared first on scmGalaxy.

Git Troubleshooting | Git Troubleshooting Techniques

scmgalaxy K — Mon, 18 Aug 2014 00:00:00 +0000

export GIT_CURL_VERBOSE=1

git push -u origin –all –verbose

git config –list

GIT_CURL_VERBOSE=1 git push

export GIT_CURL_VERBOSE=1

git push

git config --global http.postBuffer

There are useful to debug, long running Git Commands or Git Commands that seem to be hanged for some reason,

Git has an in-built functionality for us to peek into what is running behind the scenes of a git command, just add GIT_TRACE=1 before ANY git command to get additional info, for example:

Other Flags that we can use are : GIT_CURL_VERBOSE=1, -v or –verbose

[server@user sp-server-branches]$ GIT_TRACE=1 git clone

https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide

https://drupal.org/node/1065850

http://mattberther.com/2013/12/29/pushing-large-git-repos-with-ssh

http://ocaoimh.ie/2008/12/10/how-to-fix-ssh-timeout-problems/

http://unix.stackexchange.com/questions/3026/what-do-the-options-serveraliveinterval-and-clientaliveinterval-in-sshd-conf

The post Git Troubleshooting | Git Troubleshooting Techniques appeared first on scmGalaxy.

Why Git is Better than X | Git or X

scmgalaxy K — Mon, 18 Aug 2014 00:00:00 +0000

Cheap Local Branching

svn perforce

Everything is Local

bzr svn perforce

Git is Fast

svn

Git is Small

hg bzr svn perforce

The Staging Area

svn perforce

Distributed

svn perforce

Any Workflow

hg svn perforce

GitHub

perforce

Easy to Learn

hg bzr svn perforce

Git is the new standard

The post Why Git is Better than X | Git or X appeared first on scmGalaxy.

GIT Tutorial – Branching and Merging

scmgalaxy K — Wed, 04 Jun 2014 15:22:54 +0000

The post GIT Tutorial – Branching and Merging appeared first on scmGalaxy.

O’Reilly Webcast: Git in One Hour

scmgalaxy K — Wed, 04 Jun 2014 13:16:33 +0000

Please click this link to find video for the O’Reilly Webcast: Git in One Hour

The post O’Reilly Webcast: Git in One Hour appeared first on scmGalaxy.

Introduction to Git with Scott Chacon of GitHub | Git Overview

scmgalaxy K — Wed, 04 Jun 2014 13:09:15 +0000

Please go through the link to find video for the Introduction to Git with Scott Chacon of GitHub

The post Introduction to Git with Scott Chacon of GitHub | Git Overview appeared first on scmGalaxy.

BASH aliases for GIT | Bash Git Aliases Reference

scmgalaxy K — Wed, 11 Apr 2012 00:00:00 +0000

BASH aliases for GIT

Following BASH aliases can be used in ~/.BASHRC

alias g = “git status”
alias ga = “git add”
alias gaa = “git add .”
alias gc = “git commit -m”
alias gca = “git commit -am”
alias gb = “git branch”
alias gbd = “git branch -d”
alias gco = “git checkout”
alias gcob = “git checkout -b”
alias gm = “git merge”
alias gr = “git rebase”
alias gl = “git log”
alias gs = “git show”
alias gd = “git diff”
alias gbl = “git blame”
alias gps = “git push”
alias gpl = “git pull”

The post BASH aliases for GIT | Bash Git Aliases Reference appeared first on scmGalaxy.

Git Archives - scmGalaxy

Top 50 Git Interview Questions with Answers

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Answer: a

Top 50 DevOps Interview Questions with Answers

1. What is DevOps?

Answer: A

2. What is Git?

Answer: A

3. What is continuous integration?

Answer: A

4. What is Docker?

Answer: A

5. What is cloud computing?

Answer: A

6. What is Configuration Management?

Answer: A

7. What is Infrastructure as Code (IaC)?

Answer: A

8. What is Puppet?

Answer: A

9. What is Ansible?

Answer: A

10. What is Jenkins?

Answer: A

11. What is Nagios?

Answer: A

12. What is Chef?

Answer: A

13. What is Kubernetes?

Answer: A

14. What is Amazon Web Services (AWS)?