Skip to content

devopsschool/gittraining

Repository files navigation

Git installation and commands.

INSTALLATION & GUIS

With platform specific installers for Git, GitHub also provides the ease of staying up-to-date with the latest releases of the command line tool while providing a graphical user interface for day-to-day interaction, review, and repository synchronization.

For Linux and Solaris platforms, the latest release is available on the official Git web site. Git for All Platforms htp://git-scm.com

SETUP

Configuring user information used across all local repositories

git config --global user.name “[firstname lastname]” : set a name that is identifiable for credit when review version history

git config --global user.email “[valid-email]” : set an email address that will be associated with each history marker

git config --global color.ui auto : set automatic command line coloring for Git for easy reviewing

SETUP & INIT

Configuring user information, initializing and cloning repositories git init : initialize an existing directory as a Git repository git clone [url] : retrieve an entire repository from a hosted location via URL

STAGE & SNAPSHOT

Working with snapshots and the Git staging area

git status : show modified files in working directory, staged for your next commit

git add [file] : add a file as it looks now to your next commit (stage)

git reset [file] : unstage a file while retaining the changes in working directory

git diff : diff of what is changed but not staged

git diff --staged : diff of what is staged but not yet commited

git commit -m “[descriptive message]” : commit your staged content as a new commit snapshot

BRANCH & MERGE

Isolating work in branches, changing context, and integrating changes

git branch : list your branches. a * will appear next to the currently active branch

git branch [branch-name] : create a new branch at the current commit

git checkout : switch to another branch and check it out into your working directory

git merge [branch] : merge the specified branch’s history into the current one

git log : show all commits in the current branch’s history

INSPECT & COMPARE

Examining logs, diffs and object information

git log : show the commit history for the currently active branch

git log branchB..branchA : show the commits on branchA that are not on branchB

git log --follow [file] : show the commits that changed file, even across renames

git diff branchB...branchA : show the diff of what is in branchA that is not in branchB

git show [SHA] : show any object in Git in human-readable format

TRACKING PATH CHANGES

Versioning file removes and path changes

git rm [file] : delete the file from project and stage the removal for commit

git mv [existing-path] [new-path] : change an existing file path and stage the move

git log --stat -M : show all commit logs with indication of any paths that moved TEMPORARY COMMITS

IGNORING PATTERNS

Preventing unintentional staging or commiting of files

logs/ :

*.notes :

pattern*/ :

git config --global core.excludesfile [file] : system wide ignore patern for all local repositories

REWRITE HISTORY

Rewriting branches, updating commits and clearing history

git rebase [branch] : apply any commits of current branch ahead of specified one

git reset --hard [commit] : clear staging area, rewrite working tree from specified commit

TEMPORARY COMMITS

Temporarily store modified, tracked files in order to change branches

git stash : Save modified and staged changes

git stash list : list stack-order of stashed file changes

git stash pop : write working from top of stash stack

git stash drop : discard the changes from top of stash stack

Integrating JIRA with Git projects - 10 steps

You can connect the JIRA DVCS plugin to your organization account to scan commits and pull requests, creating relevant metadata and hyperlinks in any mentioned JIRA Issues.

Step 1: In the upper-right corner of any page, click your profile photo, then click Settings.

Step 2: In the left sidebar under Organization settings, click the name of your organization.

Step 3: In the left sidebar under Developer settings, click OAuth Apps.

Step 4: Click Register a new application.

Step 5: Under Application name, type "JIRA".

Step 6: Under Homepage URL, type the full URL to your JIRA instance.

Step 7: Under Authorization callback URL, type the full URL to your JIRA instance.

Step 8: Click Register application.

Step 9: Under Organization owned applications, note the "Client ID" and "Client Secret" values.

Step 10: Link your GitHub account with JIRA. For more information, see Atlassian's help documentation.

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Contributors 2

  •  
  •  

Languages