Once you have created an account on github, you will need to set it up so that you can use it with your linux account. First Step is to create a ssh private\/public keys for using in github.<\/p>\n
Mine is called firstgitproject On the teminal, go to the local folder of your project. you do \n Delete the current remote reference with initial push to new remote Clone an already existing project https Take a look at https:\/\/git-scm.com\/book\/en\/v2\/Git-Branching-Basic-Branching-and-Merging<\/a><\/p>\n Create and switch<\/p>\n Long Form of creating and switching<\/p>\n The fetch commands only updates the origin\/master. This means that you will need to merge the local branches manually. Note: Fetch does not affect your local files. It is recommended to always fetch often (Any time you want to work on your project). Switching back to branch you want to merge (for my case master) supose we have two branches main is called nssy-dev and the updated one is called experimental. Further suppose that changes have been made on the same file in both branches. In such a case merging needs to be done in such a way that we end up an up to date file with both accepted changes from both branches. (Warning: Running git merge with uncommitted changes is discouraged: while possible, it leaves you in a state that is hard to back out of in the case of a conflict.)<\/b> Begin the merge process The fetch and merge approach works great when you\u2019re working on a team or repeatedly applying changes from the same small group of people. Another approach that\u2019s a bit quicker in one-off cases is to use git-am. Every pull request has a .patch URL where you can grab a textual patch file to feed into the git-am command: Set git Push only the current branch (globally) http:\/\/kernel.org\/pub\/software\/scm\/git\/docs\/git-config.html<\/p>\n Shows all the changes between the working directory and HEAD (which includes changes in the index). This shows all the changes since the last commit, whether or not they have been staged for commit or not.<\/p>\n If you receive an error like this: error: Your local changes to ‘project_name’ would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. You can ‘stash’ your local changes and revert them later by doing: Please be cautious about this as all subsequent commits will be removed. But new files will remain intact. Make your changes then;<\/p>\n Please be cautious about this as all subsequent commits will be removed. But new files will remain intact. By default, the git push command doesn\u2019t transfer tags to remote servers. you need to specify already created tag when pushing to remote Enable Pushing of git commits & tags simultaneously More Aliases (For viewing pretty Logs)<\/p>\n More Aliases (A more useful git diff)<\/p>\n If you want to find all commits where commit message contains given word, use When someone sends you a pull request from a fork or branch of your repository, you can merge it locally to resolve a merge conflict or to test and verify the changes before merging it<\/p>\n Reference: Checking out pull requests locally <\/a><\/p>\n Long story short, you do<\/p>\n git will create a new branch pr1-author-x in your local clone with the contents of pull\/1\/head<\/p>\n Say you have a local git repository or you want to move all git info eg. commits branches etc.<\/p>\n Create a bare project on the server you want to host and get the git url for it Go to local git folder You can view the remotes with the command:<\/p>\n After that you will need to push all the branches<\/p>\n Start by pushing to master with the command:<\/p>\n After that you will need to checkout all other subsequet branches and push the as you wish<\/p>\n GIT Basics on Tagging <\/a> Once you have created an account on github, you will need to set it up so that you can use it with your linux account. First Step is to create a ssh private\/public keys for using in github. cd ~\/.ssh ssh-keygen -t rsa -C ‘salasiapro@yahoo.com’ Now save this as id_rsa_github in the .ssh folder in […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[17],"tags":[44,49],"class_list":["post-550","post","type-post","status-publish","format-standard","hentry","category-full-tutorials","tag-git","tag-version-control"],"_links":{"self":[{"href":"https:\/\/blog.nssy.org\/index.php?rest_route=\/wp\/v2\/posts\/550","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blog.nssy.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blog.nssy.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blog.nssy.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blog.nssy.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=550"}],"version-history":[{"count":84,"href":"https:\/\/blog.nssy.org\/index.php?rest_route=\/wp\/v2\/posts\/550\/revisions"}],"predecessor-version":[{"id":1148,"href":"https:\/\/blog.nssy.org\/index.php?rest_route=\/wp\/v2\/posts\/550\/revisions\/1148"}],"wp:attachment":[{"href":"https:\/\/blog.nssy.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=550"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blog.nssy.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=550"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blog.nssy.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=550"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}cd ~\/.ssh
\nssh-keygen -t rsa -C 'salasiapro@yahoo.com'
\n<\/code> Now save this as id_rsa_github in the .ssh folder in your home directory You will now have in your .ssh folder a file called id_rsa_github This is the file we will need to copy the contents over to github.com under your ssh keys (provide link here). Now we create a config file in the .ssh folder to tell git which key you use when connecting to github gedit ~\/.ssh\/config
\n<\/code> and add the contents<\/p>\nHost github.com\r\n HostName github.com\r\n User git\r\n IdentityFile ~\/.ssh\/id_rsa_github<\/pre>\n
Setup Global Information for github<\/h3>\n
git config --global user.name \"Firstname Lastname\"
\ngit config --global user.email \"your_email@youremail.com\"
\ngit config --global github.user username
\ngit config --global github.token 0123456789yourf0123456789token
\n<\/code> Note you will use the token you get from the github Now its time to start a new git project.<\/p>\nCreate a new project on git<\/h3>\n
cd ~\/Projects\/firstgitproject
\n<\/code><\/p>\nFirst Time Commit<\/h3>\n
git init
\ntouch README
\ngit add *
\ngit commit -m 'first commit'
\ngit remote add origin git@github.com:yourgitusername\/firstgitproject.git
\ngit push -u origin master
\n<\/code> Warning, starting git 2.0 (mid 2013), git add will not include unstaged (deleted) files. If you want to stage deleted files under your current path then you need to use git add -u .<\/code><\/p>\nFor the subsequent commits<\/h3>\n
git add file_that_has_changed
\ngit commit or git commit -a
\ngit push origin master
\n<\/code><\/p>\nAdding a second remote<\/h3>\n
git remote add [alias] [url]<\/code> note alias has to be unique (so if you used origin in the first remote, you will need to use something else for the alias)
\n Also not that url is preferable in the format of user@host:repo.git<\/p>\nConfigure to push to multiple remotes<\/h3>\n
git remote set-url origin --push --add user1@host1:repo1.git
\ngit remote set-url origin --push --add user2@host2:repo2.git<\/code> <\/p>\nDisplay Configured remotes<\/h3>\n
git remote -v show<\/code>\n<\/p>\nChanging remote to a different location<\/h3>\n
git remote rm origin<\/code> Add the new remote git remote add origin (URL to new remote)<\/code> <\/p>\nPushing<\/h3>\n
git push origin +HEAD<\/code><\/p>\nCloning<\/h3>\n
git clone https:\/\/github.com\/nssy\/Project<\/code> ssh git@github.com:nssy\/Project.git<\/code><\/p>\nBranching<\/h3>\n
git checkout -b new_branch_name<\/code><\/p>\ngit branch experiment
\ngit checkout experiment
\n<\/code> Make Changes git add .
\ngit commit -m \"my first branch commit\"
\ngit push origin experiment
\n<\/code> Or if set globally to push current branch git push<\/p>\nAdding Remote Branches to local repo<\/h4>\n
git branch remote_branch origin\/remote_branch<\/code><\/p>\nDeleting Branches<\/h4>\n
\ngit branch -D branchname
\ngit push origin --delete branchname
\n<\/code> or git push [remotename] [localbranch]:[remotebranch]
\n<\/code> If you leave off the [localbranch] portion, then you\u2019re basically saying, “Take nothing on my side and make it be [remotebranch].” in short git push origin :branch
\n<\/code><\/p>\nStart Tracking a Remote Branch<\/h4>\n
git branch --set-upstream new-remote-branch-name origin\/new-remote-branch-name<\/code><\/p>\nFetching & Pulling<\/h3>\n
git fetch<\/code> git pull mirrors the remote branch and the local branch you are currently in. It is equivalent of a fetch and a merge git pull<\/code><\/p>\nMerging<\/h3>\n
git checkout master<\/code>then do a merge git merge experiment
\ngit push
\n<\/code> this will update the master<\/strong> branch with all the code from experiment<\/strong> branch<\/p>\nFetch & Merge<\/h3>\n
git checkout master
\ngit remote add kneath git:\/\/github.com\/kneath\/jobs.git
\ngit fetch kneath
\ngit merge kneath\/error-page
\ngit push origin master
\n<\/code><\/p>\nMerging (Advanced)<\/h3>\n
git checkout nssy-dev<\/code>git merge experimental<\/code> Now you need to view all the changes git mergetool<\/code> Merge Types merge tool candidates: meld opendiff kdiff3 tkdiff xxdiff tortoisemerge gvimdiff diffuse ecmerge p4merge araxis bc3 emerge vimdiff Abort a merge git merge --abort<\/code><\/p>\nPatch and Apply<\/h3>\n
git checkout master
\ncurl https:\/\/github.com\/github\/jobs\/pull\/25.patch | git am
\ngit push origin master
\n<\/code> Take into account that if you are using a private repository, the patch cannot be downloaded anonymously by curl, so you have to save it through your browser, and execute: git checkout master
\ngit am \/location\/of\/patch\/25.patch
\ngit push origin master
\n<\/code><\/p>\nConfiguration<\/h3>\n
git config --global push.default current<\/code><\/p>\nRead more on Configuration<\/h3>\n
Exclude folder of files from a commit<\/h3>\n
git rm -r --cached folder\/*<\/code> or you can create the file .gitignore and add the path to exclude into .gitignore (as a line)<\/p>\nShows all the changes between the working directory and HEAD<\/h3>\n
git diff HEAD<\/code><\/p>\nCommon Errors<\/h3>\n
git stash save \"comment goes here - why am I saving this?\"<\/code> Then you can do a pull again. To restore the stash from earlier do: git stash list<\/code>git stash show stash@{0}<\/code>or if you need to see as stash as a patch<\/em>git stash show -p stash@{0}<\/code> Using Stashes git stash pop<\/code>NB: pop removes the particular stash from list of stashes<\/em>git stash apply<\/code>NB: apply leaves a copy of the stash<\/em> Delete Stashes git stash drop stash@{0}<\/code> Clear stashes git stash clear<\/code><\/p>\nReset Last commit<\/h3>\n
git reset --hard HEAD<\/code> or git reset --hard HEAD~1<\/code> for an even earlier reset git reset --hard HEAD~n<\/code>where n is the number of commits behind you want to move to<\/em> or git reset --hard HEAD^^<\/code> then git push origin HEAD --force<\/code><\/p>\nCommands to explore<\/h3>\n
git log --graph --oneline --all --decorate<\/code>git mergetool<\/code><\/p>\nDifferenciate between branches\/commits<\/h3>\n
git diff origin\/master..master
\n<\/code><\/p>\nView Commit log for a branch<\/h3>\n
git log --oneline origin\/master
\n<\/code><\/p>\nMove to a previous specific commit<\/h3>\n
Uncommited changes will also be overwritten.<\/b>git reset --hard db322e6<\/code>where db322e6<\/b> is the commit id<\/i><\/p>\nFix a commit before pushing<\/h3>\n
git add .<\/code><\/p>\ngit commit --amend -m \"your new message\"<\/code>Fix author information. Sometimes this is necessary when you find yourself commiting before setting up your git username and email<\/i>git commit --amend --reset-author<\/code><\/p>\nFix an older commit (that has been pushed)<\/h3>\n
Uncommited changes will also be overwritten.<\/b>git reset --hard -c <sha1>
\ngit commit -m \"The message you wanted to use\"
\ngit push -f
\n<\/code>Then now do a full add and push<\/i>git add
\ngit commit -sm \"Some intelligent message\"
\ngit push
\n<\/code><\/p>\nTagging<\/h3>\n
Listing Your Tags<\/h4>\n
git tag<\/code><\/p>\nCreate Annotated Tags<\/h4>\n
git tag -a v1.4 -m 'my version 1.4'<\/code>signed Annotated tags<\/i>git tag -s v1.4 -m 'my version 1.4'<\/code><\/p>\nCreate Lightweight Tags<\/h4>\n
git tag v1.4-lw<\/code><\/p>\nTag a commit<\/h4>\n
git tag -a v1.2 -m 'version 1.2' 9fceb02<\/code><\/p>\nSharing Tags<\/h4>\n
git push origin v1.5<\/code><\/p>\nPush all tags<\/h5>\n
git push origin --tags<\/code><\/p>\nDelete tag<\/h5>\n
git tag -d v1.1<\/code><\/p>\ngit config --global push.followTags true<\/code><\/p>\nGit Aliases<\/h3>\n
git config --global alias.co checkout
\ngit config --global alias.br branch
\ngit config --global alias.ci commit
\ngit config --global alias.st status
\ngit config --global alias.visual '!gitg'
git config --global alias.a \"add -A\"
\ngit config --global alias.logg \"log --graph --decorate --oneline --abbrev-commit\"
\n<\/code><\/p>\ngit config --global alias.lg \"log --graph --pretty=format:'%Cred%h%Creset - %C(bold blue)(%cr) %C(bold cyan)%ad %C(bold white)%d%Creset %s %C(bold yellow)<%an>%Creset' --abbrev-commit --date=short\"
\n<\/code><\/p>\ngit config --global alias.l \"log --date-order --date=short --graph --full-history --pretty=format:'%x08%x09%C(red)%h %C(bold cyan)%ad %C(bold blue)(%cr) %C(bold yellow)<%aN>%C(reset)%C(bold yellow)%d %C(reset)%s'\"
<\/code><\/p>\ngit config --global alias.truediff \"diff --ignore-space-at-eol -b -w --ignore-blank-lines\"
<\/code><\/p>\nOther useful Aliases (My own Preference)<\/h4>\n
git config --global alias.master \"checkout master\"
\ngit config --global alias.ss \"stash save\"
\ngit config --global alias.sp \"stash pop\"<\/code>
\nAmend with the same message (very convenient)<\/i>
\ngit config --global alias.amend \"log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend\"<\/code>
\nUnstage a file<\/i>
\ngit config --global alias.unstage \"restore --staged\"<\/code>\n<\/p>\nOther useful commands<\/h3>\n
git remote -v
\ngit branch -r
\ngit branch -a
\ngit checkout -b branch_name origin\/branch_name
\ngit push origin --delete branch_to_delete
\ngit log -p branch_name..origin\/branch_name
\ngit log --format=\"%an\" version1..HEAD | sort -u
\n<\/code><\/p>\ngrep git commits for a certain word<\/h3>\n
git log --grep=word<\/code> for all branches git log --all --grep=word<\/code> If you want to find all commits where “word” was added or removed (to be more exact: where number of occurences of “word” changed), i.e. search the commit contents, use so called ‘pickaxe’ search with git log -Sword<\/code> to look for differences whose added or removed line matches “word” (also commit contents). git log -Gword<\/code><\/p>\ncheck out a pull request<\/h3>\n
git fetch origin pull\/1\/head:pr1-author-x<\/code><\/p>\nMigrating origins<\/h3>\n
\neg.<\/p>\ngit@gitlab.com:nssy\/imported-project.git<\/pre>\n
Now change the remote with the command:<\/p>\ngit remote set-url origin git@gitlab.com:nssy\/imported-project.git<\/code><\/p>\ngit remote -v<\/code><\/p>\ngit push -u origin master<\/code><\/p>\nUseful Resources<\/h3>\n
Git config powerup with aliases, diff & log<\/a>
Advanced Alias Examples<\/a>
2.7 Git Basics – Tips and Tricks<\/a>
More advanced aliases<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"