Difference between revisions of "Git notes"

From Wiki at Neela Nurseries
Jump to: navigation, search
m (^ How To Use Git)
m (^ How To Use Git)
Line 25: Line 25:
 
*  [https://orga.cat/posts/most-useful-git-commands Most useful git commands - Orga.cat]
 
*  [https://orga.cat/posts/most-useful-git-commands Most useful git commands - Orga.cat]
 
*  [http://mherman.org/blog/2013/10/11/basic-git-commands/#.WdFVqp5Lfok Basic git commands by Micheal Herman]
 
*  [http://mherman.org/blog/2013/10/11/basic-git-commands/#.WdFVqp5Lfok Basic git commands by Micheal Herman]
*  Example stash with helpful options:  `361  git stash save --include-untracked --keep-index`
+
*  Example stash with helpful options:  <i>$ git stash save --include-untracked --keep-index</i>
 
*  https://www.atlassian.com/git/tutorials/merging-vs-rebasing  . . . found by Rafael
 
*  https://www.atlassian.com/git/tutorials/merging-vs-rebasing  . . . found by Rafael
  

Revision as of 15:56, 18 March 2020

-- 2017-12-04 Monday - somvaar - सोमवार--
Git Notes


^ 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:


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


Setting up ssh key pairs for secure authentication:


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


Git references found while answering specific git task questions:

  $ git diff HEAD .


Markdown and .md file formatting at Github


Git and Working with Remote Repositories


Release tag creation and naming in Git



^ 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

  *  https://git-scm.com/docs/git-branch
  *  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



^ Using Git and Subversion Together

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


^ References