Git

git is an SCM methodology and technology using an (arguably) simplified set of commands for version control in comparison to similar methodologies (namely, CVS and SVN), and allowing for distributed repositories such that a developer first "pulls" a full copy of the repository locally with its own versioning. Once they are satisfied with a particular set of code updates or new feature addition, they can "push" all of their code from local (as per traditional SCM), or, simply push the changes which can then be first piped through a "Code Review" step in the SCM pipeline before being merged back to the main repository, which via DIFF can show exactly what changes were made and whether there are any conflicts with the latest version of the repository. If there are conflicts the updated code never gets merged back to the main tree directly, another pull request will get the developer's repository up-to-date first, and then they can try again. This in theory, reduces situations where small incremental updates from widely dispersed teams of developers wipe out the work of other developers in the main "branch".

Distributed Repositories

git versioning stores code in a repository (commonly abbreviated as repo). The repo is by default held on your own system with branches separate from master; however that configuration is of limited use to larger teams. It is much better to run in distributed version control mode to realize the full power of git. Some popular sites & web services have cropped up to support distributed git modes, and will be summarized below.

GitLab

GitLab is an open source SCM tool that combines a web-based GIT platform with a desktop client (via Gitorious acquisition), and a strong focus on CI/CD.

• GitLab: https://about.gitlab.com/

BitBucket

BitBucket is an SCM tool that provides both GIT and Mercurial repository hosting either in a Cloud or Self-Hosted model. Tthe Self=Hosted option is formerly known as "Stash" before Atlassian acquired BitBucket and merged the two tools under the BitBucket banner, taking the BitBucket name)

Stash

• BitBucket Server (Stash): https://www.atlassian.com/software/bitbucket/download | DOCS
• Managing WebHooks in Bitbucket Server: https://confluence.atlassian.com/bitbucketserver/managing-webhooks-in-bitbucket-server-938025878.html
• Jenkins plugins -- BitBucket Server: https://go.atlassian.com/jenkins-eap-download | SRC

BitBucket Cloud

• BitBucket Cloud: https://bitbucket.org/
• BitBucket -- Add-ons Marketplace: https://marketplace.atlassian.com/plugins/app/bitbucket/popular

• BitBucket Status: https://twitter.com/BitBucketStatus (Twitter feed for more up-to-date BitBucket outage reports)
• BitBucket WebHooks: https://confluence.atlassian.com/bitbucket/manage-webhooks-735643732.html | SRC

BitBucket Pipelines

• BitBucket Pipelines: https://bitbucket.org/product/features/pipelines | DOCS | VALIDATOR

Workflows

• Workflow for Git feature branching: https://confluence.atlassian.com/bitbucket/workflow-for-git-feature-branching-814201830.html

BitBucket Deployments

• BitBucket Deployments: https://confluence.atlassian.com/bitbucket/bitbucket-deployments-940695276.html

Git LFS

• GIT Large File Storage (LFS): https://git-lfs.github.com/ (open source Git extension for versioning large files... partnership between rivals GitHub & BitBucket created this OSS extension to GIT)

• BitBucket for Slack (Slack APP): https://get.slack.help/hc/en-us/articles/115005265283-Bitbucket-for-Slack | Slack for BitBucket (BitBucket PLUGIN) | DOCS

GitHub

GitHub was "the" original web-based GIT platform. Aside from being a robust platform with good uptime, it also offers "subscription0-based" plans for Private repositories and [GitHub Pages] (a free project-info/landing-page hosting service), as well as a number of other useful features (including integrations to the most popular development tools).

• GitHub: http://github.com | EXAMPLE | EXAMPLE - PAGES

Branching Models

Centralized

Similar to SVN.

• Git Branching strategy - Comparing workflows: https://www.atlassian.com/git/tutorials/comparing-workflows

Feature Branching

Branch-per-issue or Feature (i.e. "User Story" in Agile), branching off of "master".

Gitflow

Branch-per-issue or Feature (i.e. "User Story" in Agile), but this time branching off of a "develop" branch which gets synched with changes (hotfixes) down from "master" as soon as possible. We can cut a "release" branch off of the "develop" branch when a significant enough amount of work has been Code Reviewed through a Pull Request (PR), giving us a release candidate that gets merged into "master". If any changes whatsoever occur in "release" they must be merged down to "develop" as well to ensure consistency.

The main goal is to keep "master" releasable (aka. ever-green), while also separating bug fix type of work from new feature development or project work.

• A successful Git branching model: http://nvie.com/posts/a-successful-git-branching-model/
• Git Branching - Branches in a Nutshell: https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell
• Feature Branching vs. Feature Flags -- What’s the Right Tool for the Job?: https://devops.com/feature-branching-vs-feature-flags-whats-right-tool-job/
• When should a build task be triggered while using GitFlow?: https://community.atlassian.com/t5/Bamboo-discussions/When-should-a-build-task-be-triggered-while-using-GitFlow/td-p/602030
• Continuous Delivery workflows with the (Gitflow) branch-per-issue model: https://www.atlassian.com/continuous-delivery/continuous-delivery-workflows-with-feature-branching-and-gitflow
• Gitflow (CHEAT SHEET): http://danielkummer.github.io/git-flow-cheatsheet/

Gitflow 2.0

Branch-per-issue or Feature (i.e. "User Story" in Agile), but differing from the first Gitflow proposal because now we branch any long-lived (lasting a Sprint or longer) features being developed, off of a project-specific "develop/project" branch which originates off of the "master" branch rather than a single long-lived "develop" branch. Then we cut our "release" branches directly off of the "develop/project" branches as they are completed, giving us a release candidate for production which needs to get synched with any changes (hotfixes) down from "master" as soon as they are made.

The main goal is still to keep "master" releasable (aka. ever-green) but the secondary goal is to also prevent any unwanted code from the project branches getting merged (i.e. unfinished work, half-baked feature, feature intentionally being withheld).

• When Gitflow Stops Being Agile: https://web.archive.org/web/20170618105931/https://www.isostech.com/blogs/software-development/gitflow-stops-agile/
• gitflow: https://github.com/petervanderdoes/gitflow-avh/ | SRC | DOCS (AVH version is the most current and widely used fork of original gitflow)
• Gitflow - A convincing testimonial: https://jeffkreeftmeijer.com/git-flow/
• GitFlow - on the path (VIDEO): https://web.archive.org/web/20110802055148/http://codesherpas.com/screencasts/on_the_path_gitflow.mov

GitOps

A term coined by Operations engineers at WeaveWorks (and possibly elsewhere in the SRE/DevOps communities) following and promoting the philosophy of "versioning everything that moves/changes" or in other words "Everything-as-code" (i.e. Configuration-as-Code, Infrastructure-as-Code, Network-as-Code, Database-as-Code, Pipeline-as-Code, etc). In particular, the "GitOps movement" tends to gravitate towards git as the preferred SCM tool due to its flexibility and powerful history/branching/commit models it enables.

• GitOps - Operations by Pull Request: https://www.weave.works/blog/gitops-operations-by-pull-request
• Already learned DevOps? Great, now it’s time for GitOps: https://thenextweb.com/contributors/2018/12/08/all-you-need-to-know-about-gitops/
• GitOps — Git Push All the Things: https://dzone.com/articles/gitops-git-push-all-the-things

Tools

• GIT source code management: http://git-scm.com/ (OFFICIAL PROJECT/SITE)
• msysgit - Git for Windows : http://code.google.com/p/msysgit/
• GitOSX - Git for Mac: http://code.google.com/p/git-osx-installer/
• Giggle - Git for Linux (Ubuntu): http://live.gnome.org/giggle
• Gitblit: http://gitblit.com/ (Java-based cross-platform GIT server & client)
• Bonobo Git Server: https://bonobogitserver.com (simple self-hosted git server for Windows which runs on IIS)
• Microsoft - Git Credential Manager (for Windows): https://github.com/Microsoft/Git-Credential-Manager-for-Windows
• GIT ignore helper: https://gitignore.io (build an platform/framework/language/IDE-specific .gitignore file)
• YAML validator: http://www.yamllint.com/
• YAML Validator for "bitbucket-pipelines.yml" format: https://bitbucket-pipelines.prod.public.atl-paas.net/validator

SourceTree

• SourceTree: https://www.sourcetreeapp.com/

Resources

• GIT (E-BOOK): https://git-scm.com/book/en/v2
• Pro GIT (E-BOOK): http://progit.org/book/
• Git - SVN user's Crash Course: http://git-scm.com/course/svn.html (side-by-side comparison)

• Git visual cheat sheet: http://zrusin.blogspot.com/2007/09/git-cheat-sheet.html
• Useful Git Commands: https://dzone.com/articles/useful-git-commands
• Top 10 GIT commands for a newbie: http://niklasschlimm.blogspot.com/2011/07/top-10-git-commands-for-newbie.html
• Bash Script to Convert Subversion (SVN) repo to GIT: http://java.dzone.com/articles/bash-script-convert-subversion
• Automated git deployments from Bitbucket: http://jonathannicol.com/blog/2013/11/19/automated-git-deployments-from-bitbucket/ (PHP script to listen for BitBucket "WebHook" requests)
• Feature branching your way to greatness: http://www.atlassian.com/agile/branching (3 types of winning branch strategies, less to more granularity/impact: Release, Feature-flag, Task/Defect)
• Patterns for Managing Source Code Branches: https://martinfowler.com/articles/branching-patterns.html#experimental-branch (excellent round-up of the main strategies)
• Trunk Based Development: https://trunkbaseddevelopment.com
• git-flow cheat sheet: http://danielkumtmer.github.io/git-flow-cheatsheet/
• git docs -- PRETTY FORMATS: https://git-scm.com/docs/pretty-formats

Tutorials

• GIT Immersion: http://gitimmersion.com/
• Learn GIT Branching: https://learngitbranching.js.org/
• Git - getting stared: https://git-scm.com/book/en/v1/Getting-Started-About-Version-Control
• Git Tutorial: http://schacon.github.com/git/gittutorial.html
• Git tutorial: https://git-scm.com/docs/gittutorial
• GitHub - learning challenges: https://try.github.io/levels/1/challenges/1
• Git For Windows Developers – Git Series: http://www.lostechies.com/blogs/jason_meridth/archive/2009/06/01/git-for-windows-developers-git-series-part-1.aspx
• GIT on windows - Screencast: http://gitcasts.com/posts/git-on-windows
• Git for NetBeans: http://netbeans.org/kb/docs/ide/git.html

• git on Windows - find location of configuration files: https://www.onwebsecurity.com/configuration/git-on-windows-location-of-global-configuration-file.html (this gives you some hints at the install folders, and for instance whether your 3rd party GIT client is using an embedded or system GIT)

• How to build your own Git server: https://opensource.com/life/16/8/how-construct-your-own-git-server-part-6
• How to run your own Git Server: https://www.linux.com/learn/how-run-your-own-git-server

• Tutorial -- how to use git through a proxy: http://cms-sw.github.io/tutorial-proxy.html
• How to upgrade to the latest version of Git on Windows? Still showing older version: https://stackoverflow.com/questions/13790592/how-to-upgrade-to-the-latest-version-of-git-on-windows-still-showing-older-vers
• GIT alias: https://www.atlassian.com/git/tutorials/git-alias (convenience utility for common settings)

• Commits are snapshots, not DIFFs: https://github.blog/2020-12-17-commits-are-snapshots-not-diffs/
• What is the difference between 'git pull' and 'git fetch'?: http://stackoverflow.com/questions/292357/what-is-the-difference-between-git-pull-and-git-fetch#292359
• Difference between “git add -A” & “git add .”: https://stackoverflow.com/questions/572549/difference-between-git-add-a-and-git-add
• What are the differences between “git commit” and “git push”?: http://stackoverflow.com/questions/2745076/what-are-the-differences-between-git-commit-and-git-push
• git - pushing & pulling: http://gitready.com/beginner/2009/01/21/pushing-and-pulling.html
• Pushing to a remote: https://help.github.com/articles/pushing-to-a-remote/
• Pull requests: http://help.github.com/pull-requests/ (let you tell others about changes you've pushed to a GitHub repository)
• The quickest and easiest "Getting Started w/ GitHub" article you'll ever read!: http://ryanlowdermilk.com/2012/01/the-quickest-and-easiest-getting-started-w-github-article-youll-ever-read/
• Getting the Hang of GitHub: http://net.tutsplus.com/tutorials/other/getting-the-hang-of-github/
• GitHub Flow -- Managing Issues with git-flow: http://scottchacon.com/2011/08/31/github-flow.html
• Understanding the GitHub Flow: https://guides.github.com/introduction/flow/

• GIT - ignoring files: http://gitready.com/beginner/2009/01/19/ignoring-files.html
• Ignoring Files on Git (but just for a while): http://dzone.com/articles/ignoring-files-on-git-but-just-for-a-while-with-as
• Remove unwanted to accidentally added file(s) from a Git commit: https://stackoverflow.com/a/42450337/335867 (works even if already pushed, just need to "force-push")
• How do I remove sensitive files from git's history: http://stackoverflow.com/questions/872565/how-do-i-remove-sensitive-files-from-gits-history
• GIT ignoring doesn't remove a file: http://gitready.com/beginner/2009/03/06/ignoring-doesnt-remove-a-file.html
• Remove files from git repo completely: http://stackoverflow.com/questions/5563564/remove-files-from-git-repo-completely
• Ignore files that have already been committed to a Git repository: https://stackoverflow.com/questions/1139762/ignore-files-that-have-already-been-committed-to-a-git-repository
• How can I add an empty directory to a Git repository?: https://stackoverflow.com/questions/115983/how-can-i-add-an-empty-directory-to-a-git-repository

• How to Become a Better GIT user: http://java.dzone.com/articles/how-become-better-git
• So You Want Your Team To Start Using Git? -- Part 4, Team Workflows: http://java.dzone.com/articles/so-you-want-your-team-start-0
• How do I keep two git repositories in sync?: http://stackoverflow.com/questions/14370929/how-do-i-keep-two-git-repositories-in-sync
• What's the difference between git clone --mirror and git clone --bare: http://stackoverflow.com/questions/3959924/whats-the-difference-between-git-clone-mirror-and-git-clone-bare
• How can I change the remote/target repository URL on Windows?: https://stackoverflow.com/questions/1800859/how-can-i-change-the-remote-target-repository-url-on-windows#8676555

• Git merge master down into feature branch: https://stackoverflow.com/questions/16955980/git-merge-master-into-feature-branch#16957483 (or "develop" branch of GITFLOW for instance)
• How to With Git -- Rename Branch: http://www.hostingadvice.com/how-to/git-branch-rename/
• Rename a local & remote branch in git: https://multiplestates.wordpress.com/2015/02/05/rename-a-local-and-remote-branch-in-git/
• GIT - Undoing Changes: https://www.atlassian.com/git/tutorials/undoing-changes
• Reset Demystified: https://git-scm.com/2011/07/11/reset.html
• How to undo 'git add' before commit?: https://stackoverflow.com/questions/348170/how-to-undo-git-add-before-commit
• Move (or “Undo”) last git commit to unstaged area: https://stackoverflow.com/questions/10846875/move-or-undo-last-git-commit-to-unstaged-area?noredirect=1&lq=1
• How do I undo the last commits in Git?: https://stackoverflow.com/questions/927358/how-do-i-undo-the-last-commits-in-git
• How to delete an entire "git commit" (including history): http://stackoverflow.com/questions/1338728/how-to-delete-a-git-commit
• Delete commits from a branch in Git: https://stackoverflow.com/questions/1338728/delete-commits-from-a-branch-in-git
• SourceTree - undo unpushed commits: https://stackoverflow.com/questions/23865335/sourcetree-undo-unpushed-commits
• Git reverse commit a pushed merge in SourceTree: https://stackoverflow.com/questions/35652427/git-reverse-commit-a-pushed-merge-in-sourcetree
• How to revert Git repository to a previous commit?: http://stackoverflow.com/questions/4114095/how-to-revert-git-repository-to-a-previous-commit
• How to modify a specified commit?: https://stackoverflow.com/questions/1186535/how-to-modify-a-specified-commit
• How do you make changes on a specific commit?: https://confluence.atlassian.com/stashkb/how-do-you-make-changes-on-a-specific-commit-747831891.html
• Change commit message for specific commit: https://stackoverflow.com/questions/38892599/change-commit-message-for-specific-commit
• How to change a commit message in git after push: https://medium.com/@_oleksii_/how-to-change-a-commit-message-in-git-after-push-32d1fbd6fc3b
• Advanced Git Commands - Rewriting History: https://dzone.com/articles/advanced-git-commands-rewriting-history
• SourceTree -- Tip of the Week - Save (STASH) Your Changes for Later: https://community.atlassian.com/t5/Sourcetree-articles/Tip-of-the-Week-Save-Your-Changes-for-Later/ba-p/673999

• Advanced Git log: https://www.atlassian.com/git/tutorials/git-log
• List JIRA ticket IDs from Git log: https://coderwall.com/p/_-9dvq/list-jira-ticket-ids-from-git-log
• Viewing Log/History of a Repository (as ascii/text graph): https://confluence.atlassian.com/sourcetreekb/viewing-log-history-of-a-repository-785615840.html
• List git commits to master branch between two dates: https://stackoverflow.com/questions/27313309/list-git-commits-to-master-branch-between-two-dates?answertab=active#tab-top
• git log of a single revision: https://stackoverflow.com/questions/4082126/git-log-of-a-single-revision
• How to output git log with the first line only?: https://stackoverflow.com/questions/4479225/how-to-output-git-log-with-the-first-line-only
• Print commit message of a given commit in git: https://stackoverflow.com/questions/3357280/print-commit-message-of-a-given-commit-in-git
• How to view file diff in git before commit: https://stackoverflow.com/questions/10039747/how-to-view-file-diff-in-git-before-commit#10039758
• 6 steps to better release management in JIRA Software: https://www.atlassian.com/blog/fjira-software/jira-release-management-steps
• Git Log's --first-parent Option: http://marcgg.com/blog/2015/08/04/git-first-parent-log/
• How do I view all commits for a specific day?: https://stackoverflow.com/questions/19987099/how-do-i-view-all-commits-for-a-specific-day
• Git Discipline -- combining multiple feature branches, but still keeping them separate?: https://stackoverflow.com/questions/5082161/git-discipline-combining-multiple-feature-branches-but-still-keeping-them-sepa ("git merge feature/A feature/B" from within a third branch from same origin)
• How can I view a git log of just one user's commits?: https://stackoverflow.com/questions/4259996/how-can-i-view-a-git-log-of-just-one-users-commits

• BitBucket's guide to Resolving Merge Conflicts: https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html
• GitHub's guide to Resolving a merge conflict using the command line: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
• Staging Deleted files: https://stackoverflow.com/questions/12373733/staging-deleted-files
• git -- what to do if you commit to no branch: https://edspencer.net/2009/10/28/git-what-to-do-if-you-commit-to-no-branch/
• What to do with commit made in a detached head: https://stackoverflow.com/questions/7124486/what-to-do-with-commit-made-in-a-detached-head/7124513#7124513
• What Git branching models work for you?: https://stackoverflow.com/questions/2621610/what-git-branching-models-work-for-you
• What is Your Branching Model? : https://paulhammant.com/2013/12/04/what_is_your_branching_model/
• How to modify a specified commit?: https://stackoverflow.com/questions/1186535/how-to-modify-a-specified-commit
• How to clone a specific branch in GIT bitbucket: https://stackoverflow.com/questions/29981000/how-to-clone-a-specific-branch-in-git-bitbucket
• The following untracked working tree files would be overwritten by checkout: https://stackoverflow.com/questions/4858047/the-following-untracked-working-tree-files-would-be-overwritten-by-checkout (use "git checkout -f <BRANCH_NAME>" to force switching branches)
• Git stash pop- needs merge, unable to refresh index: https://stackoverflow.com/questions/9739352/git-stash-pop-needs-merge-unable-to-refresh-index
• Delete old branches in Git: https://hackernoon.com/delete-old-branches-in-git-ab1ec5049dd9
• What is "git tag", How to create tags & How to checkout git remote tag(s): https://stackoverflow.com/questions/35979642/what-is-git-tag-how-to-create-tags-how-to-checkout-git-remote-tags
• How can I move a tag on a git branch to a different commit?: https://stackoverflow.com/questions/8044583/how-can-i-move-a-tag-on-a-git-branch-to-a-different-commit#8044605 (shortcut: force delete tag from local & remote, create tag with same name at current point in time)
• Does “git fetch --tags” include “git fetch”?: https://stackoverflow.com/questions/1204190/does-git-fetch-tags-include-git-fetch
• Git Tools - Advanced Merging: https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging
• Git Branching - Basic Branching and Merging: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts
• Feature Branching while still following CI: https://martinfowler.com/bliki/FeatureBranch.html
• Git Branching - Rebasing: https://git-scm.com/book/en/v2/Git-Branching-Rebasing
• Interactive rebase in Sourcetree: https://www.atlassian.com/blog/sourcetree/interactive-rebase-sourcetree
• Git - Move Your Latest Commits to Another Branch: https://howchoo.com/git/git-move-your-latest-commits-to-another-branch
• Pull Request "etiquette" guide: https://gist.github.com/mikepea/863f63d6e37281e329f8
• When is the right time to commit or use a branch?: https://blog.scottlogic.com/2019/12/19/source-control-when.html
• Writing Meaningful Commit Messages: https://reflectoring.io/meaningful-commit-messages/
• Git merging .vs. rebasing: https://dzone.com/articles/merging-vs-rebasing

External Links

• wikipedia: Git
• wikipedia: GitHub
• wikipedia: Version control
• wikipedia: Repository (version control)
• wikipedia: Monorepo
• wikipedia: Commit (version control)
• wikipedia: Commit (data management)
• wikipedia: Atomic commit
• wikipedia: Two-phase commit protocol (2PC)
• wikipedia: Three-phase commit protocol (3PC)
• wikipedia: Upstream (software development)
• wikipedia: Downstream (software development)
• wikipedia: Ultra-large-scale systems (ULSS)
• wikipedia: Archive file
• Everyday GIT With 20 Commands Or So: http://www.kernel.org/pub/software/scm/git/docs/everyday.html
• Advanced GIT: http://www.slideshare.net/segv/advanced-git
• Working with both GIT and SVN: http://blog.lysender.com/2010/01/working-both-git-and-svn/
• Here's the Gist of it: https://github.com/blog/118-here-s-the-gist-of-it
• Github Gist - Versioning For Pasted Code: http://www.infoq.com/news/2008/07/gist-versioning-for-pasting;jsessionid=985F5A48B7B1F239F6C119071BE2BA1D
• GitHub hacked, millions of projects at risk of being modified or deleted: http://www.extremetech.com/computing/120981-github-hacked-millions-of-projects-at-risk-of-being-modified-or-deleted
• Stupid trouble with git commit “commit message”: http://stackoverflow.com/questions/5599122/stupid-trouble-with-git-commit-commit-message
• git replacing LF (Unix) with CRLF (Windows) Line-endings: http://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf
• Create a new file in git bash: http://stackoverflow.com/questions/18932202/create-a-new-file-in-git-bash
• Git for Windows -- .bashrc or equivalent config files for Git Bash shell: http://stackoverflow.com/questions/6883760/git-for-windows-bashrc-or-equivalent-config-files-for-git-bash-shell
• Basics - Tips and Tricks: https://git-scm.com/book/en/v1/Git-Basics-Tips-and-Tricks
• Changing SmartGit Free Trial License to Non-Commercial: http://paikialog.wordpress.com/2011/04/07/changing-smartgit-free-trial-license-to-non-commercial/
• Error when open sourcetree after update: https://jira.atlassian.com/browse/SRCTREEWIN-7897
• Easily Calculate Your Project Version With Git (using Maven/Gradle plugin "jgitver"): http://dzone.com/articles/easily-calculate-your-project-version-with-git
• Introducing the Redesigned Bitbucket: http://blog.bitbucket.org/2012/10/09/introducing-the-redesigned-bitbucket/
• Atlassian Acquires Bitbucket.org, Distributed Version Control System Hosting: https://blogs.atlassian.com/2010/09/atlassian_acquires_bitbucket_org_distributed_version_control_system_hosting/
• Default reviewers for pull requests (BB-9992): https://bitbucket.org/site/master/issues/8810/default-reviewers-for-pull-requests-bb
• How to show or change your Git username or email address: https://alvinalexander.com/git/git-show-change-username-email-address
• Change the author and committer name and e-mail of multiple commits in Git: https://stackoverflow.com/questions/750172/change-the-author-and-committer-name-and-e-mail-of-multiple-commits-in-git
• How to change the commit author for one specific commit?: https://stackoverflow.com/questions/3042437/how-to-change-the-commit-author-for-one-specific-commit#3042512

• Atlassian -- Pull Request Merge Strategies - The Great Debate: https://developer.atlassian.com/blog/2014/12/pull-request-merge-strategies-the-great-debate/
• Atlassian -- Git team workflows - merge or rebase?: https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase
• BitBucket -- Merging vs. Rebasing: https://www.atlassian.com/git/tutorials/merging-vs-rebasing
• The Multiple Usages of git rebase --onto: https://dzone.com/articles/the-multiple-usages-of-git-rebase-onto
• How I Stopped Worrying and Learned to Love `git Rebase`: https://drew.thecsillags.com/Stopped-Worrying-And-Love-Git-Rebase/
• Why you should stop using Git rebase: https://medium.com/@fredrikmorken/why-you-should-stop-using-git-rebase-5552bee4fed1

• How to squash all git commits into one?: http://stackoverflow.com/questions/1657017/how-to-squash-all-git-commits-into-one
• Squash Commits with Git: https://davidwalsh.name/squash-commits-git
• Always Squash and Rebase your Git Commits: https://blog.carbonfive.com/2017/08/28/always-squash-and-rebase-your-git-commits/
• git rebase - is squashing initial commits generally a bad idea?: https://stackoverflow.com/questions/30194526/git-rebase-is-squashing-initial-commits-generally-a-bad-idea
• Git - When to Merge vs. When to Rebase: https://www.derekgourlay.com/blog/git-when-to-merge-vs-when-to-rebase/
• Git Merge vs. Rebase -- What’s the Diff?: https://hackernoon.com/git-merge-vs-rebase-whats-the-diff-76413c117333

• Edit a commit message in SourceTree Windows (already pushed to remote): https://stackoverflow.com/questions/17604232/edit-a-commit-message-in-sourcetree-windows-already-pushed-to-remote
• Changing a commit message (CLI): https://help.github.com/articles/changing-a-commit-message/
• Selecting Git commits by commit message: https://blog.sebastian-daschner.com/entries/git-selecting-commit-message
• GIT Good -- A Practical Introduction to GIT and GitHub (Hello GitHub): https://codeburst.io/git-good-part-a-e0d826286a2a
• The Dark Side of the Force Push: http://willi.am/blog/2014/08/12/the-dark-side-of-the-force-push/
• If you cherry pick, your branch model is wrong: http://www.draconianoverlord.com/2013/09/07/no-cherry-picking.html
• Avoiding Git Disasters -- A Gory Story: https://randyfay.com/content/avoiding-git-disasters-gory-story
• 8 Useful but Not Well-Known Git Concepts: https://dzone.com/articles/8-useful-but-not-well-known-git-concepts
• Atlassian -- Guide to GIT merge conflicts: https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts
• Git Workflows: https://medium.com/@jurtzmarcel/git-workflows-cb0c023ca88
• 10 things I hate about Git: https://stevebennett.me/2012/02/24/10-things-i-hate-about-git/

• Difference between CR LF, LF and CR line break types?: https://stackoverflow.com/questions/1552749/difference-between-cr-lf-lf-and-cr-line-break-types
• How to change line-ending settings: https://stackoverflow.com/questions/10418975/how-to-change-line-ending-settings#10419350
• What's the best CRLF (carriage return, line feed) handling strategy with Git?: https://stackoverflow.com/questions/170961/whats-the-best-crlf-carriage-return-line-feed-handling-strategy-with-git
• Mind the End of Your Line: https://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/
• Dealing with line endings: https://help.github.com/articles/dealing-with-line-endings/
• How line ending conversions work with git "core.autocrlf" between different operating systems: https://stackoverflow.com/questions/3206843/how-line-ending-conversions-work-with-git-core-autocrlf-between-different-operat
• Line endings LF vs. CRLF: https://www.reddit.com/r/git/comments/7tfh7c/line_endings_lf_vs_crlf/
• Java ".gitattributes" example: https://github.com/alexkaratarakis/gitattributes/blob/master/Java.gitattributes
• Refreshing a repository after changing line endings: https://help.github.com/articles/dealing-with-line-endings/#refreshing-a-repository-after-changing-line-endings
• Force LF eol in git repo and working copy: https://stackoverflow.com/questions/9976986/force-lf-eol-in-git-repo-and-working-copy#9977954
• git replacing LF with CRLF: https://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf
• 5 tips for CI-friendly Git repos: https://www.atlassian.com/git/articles/ci-friendly-git-repos
• Dealing with Maven dependencies when switching to Git: https://www.atlassian.com/git/articles/maven-dependencies-versions-merging
• How This Startup (GitLab) Made $10.5 Million in Revenue With Every Single Employee Working From Home: https://www.inc.com/cameron-albert-deitch/2018-inc5000-gitlab.html
• Top 10 GitHub best practices for developers: https://medium.com/datreeio/top-10-github-best-practices-for-developers-d6309a613227
• GitHub -- CODEOWNERS file: https://help.github.com/en/articles/about-code-owners
• The best way to store your ".dotfile" -- A bare Git repository: https://www.atlassian.com/git/tutorials/dotfiles
• git -- Pushing to a Remote Branch with a Different Name: https://penandpants.com/2013/02/07/git-pushing-to-a-remote-branch-with-a-different-name/
• The version controlled home directory: https://web.archive.org/web/20120325085518/https://tensixtyone.com/perma/the-version-controlled-home-directory
• Symbolic links in Git: https://www.mokacoding.com/blog/symliks-in-git/
• Git Symlinks in Windows: https://stackoverflow.com/questions/5917249/git-symlinks-in-windows
• How does Git handle symbolic links?: https://stackoverflow.com/questions/954560/how-does-git-handle-symbolic-links
• Token authentication requirements for Git operations: https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/

See Also

SCM | SSH | CVS | SVN