Difference between revisions of "Git notes"

Revision as of 00:16, 11 May 2021

^ OVERVIEW - अवलोकन

Following article / document collection of notes on version control software named git.

^ How To Use Git

Wanting to understand and use git better, here are some on-line references to git version control. Noting here git reference at orga.cat, this reference well-written with lots of commands and concise explanations of each command. This reference is first in list:

Basic git commands:

• Most useful git commands - Orga.cat
• Basic git commands by Micheal Herman
• Example stash with helpful options: $ git stash save --include-untracked --keep-index
• https://www.atlassian.com/git/tutorials/merging-vs-rebasing . . . found by Rafael

2020-05-06

• https://www.tutorialspoint.com/git/git_patch_operation.htm Git patch commands, found by Joel Hart

Atlassian article on Git's edit/stage/commit pattern of use (Invoke `git add` to stage local file changes.):

• https://www.atlassian.com/git/tutorials/saving-changes

Setting up ssh key pairs for secure authentication:

• https://help.github.com/en/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent . . . generate new key and add key to ssh-agent

Why are my local changes getting lost? Git commit-and-push-sequence not sufficient to transfer file changes to given git repository . . .

• [1] git merging
• git merge and rebase commands
• git stage, commit, push on command line
• git 'commit' akin to traditional 'save file', Subversion model versus Git model

Git references found while answering specific git task questions:

• Create new git repository by Karl Broman
• Add existing project to Github
• rename a file under Git version control
• git-diff

• https://www.kernel.org/pub/software/scm/git/docs/git-diff.html

  $ git diff HEAD .

Markdown and .md file formatting at Github

• Mastering markdown

Git and Working with Remote Repositories

• git-scm dot com - book, English, version 2, "Working with Remotes"

Release tag creation and naming in Git

• https://git-scm.com/book/en/v2/Git-Basics-Tagging

^ Git Command Examples

On the local work station, to see from which remote git repository a working copy comes:

   $ git remote -v

^ Git Terminology

What it means to 'rebase' in context of git . . .

  *  https://git-scm.com/docs/git-rebase

^ Git Branching

An official starting point for git branch use can be found at https://git-scm.com/docs/git-branch. Some articles on the large topic of best branching practices include:

• https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows
• https://dev.to/zenulabidin/git-branches-best-practices-46oo
• https://nvie.com/posts/a-successful-git-branching-model/ <-- This nvie.com article excellent git resource!

When there are local changes that haven't been committed . . .

  *  https://stackoverflow.com/questions/20568971/git-pull-keeps-telling-me-to-stash-local-changes-before-pulling

Excerpt from above link:

It sounds like your local branch does not have all of the changes on origin.

Firstly, stash your changes

git stash

Then, pull in the changes from origin.

git fetch origin && git rebase origin/(branch name)

Next, add the stash back in to your working directory:

git stash pop

Renaming local and remote branches:

• https://linuxize.com/post/how-to-rename-local-and-remote-git-branch/

^ Using Git and Subversion Together

Using Git and Subversion on one and the same project looks complicated . . .

• https://git-scm.com/book/en/v1/Git-and-Other-Systems-Git-and-Subversion

^ References

• https://github.com/joshnh/Git-Commands