{"id":12,"date":"2013-09-23T16:48:31","date_gmt":"2013-09-23T16:48:31","guid":{"rendered":"http:\/\/linux.mycustomcycle.com\/?p=12"},"modified":"2015-02-19T19:35:29","modified_gmt":"2015-02-19T19:35:29","slug":"git","status":"publish","type":"post","link":"http:\/\/linux.suriyasuneel.com\/?p=12","title":{"rendered":"Git"},"content":{"rendered":"

How to use Git<\/h3>\n
    \n
  1. Create a remote repository<\/li>\n
  2. Create a local repository<\/li>\n
  3. Add files to the local repository<\/li>\n
  4. push the local files to the remote repository<\/li>\n<\/ol>\n

    Create a remote repository<\/h3>\n

    How to setup a git server is in a different page.
    \nI’m going to concentrate on how to create a repository in a remote server which is already setup for the git.
    \nOur goal is to create a remote repository for the projects makefiles. This has files that automate my build processes.<\/p>\n

      \n
    1. Login to the remote server as the git user<\/li>\n
    2. go to the root folder of your git repositories\n
        \n
      • in my case it will be \/home\/git<\/li>\n<\/ul>\n<\/li>\n
      • create a folder called makefiles.git\n
        $mkdir makefiles.git<\/pre>\n<\/li>\n
      • change to the folder as\n
        $cd makefiles.git<\/pre>\n<\/li>\n
      • initialize the repository inside the makefiles.git folder as\n
        $git --bare init<\/pre>\n<\/li>\n<\/ol>\n
        Setup the local repository<\/h3>\n
        If you are adding a folder which contains the files for your project then go that folder.<\/p>\n
          \n
        1. Initialize git in the folder as\n
          $git init<\/pre>\n<\/li>\n
        2. Mark to add all the files to the git as\n
          $git add *<\/pre>\n<\/li>\n
        3. Add all the files by committing the add as\n
          $git commit -a<\/pre>\n<\/li>\n<\/ol>\n
          Setting the remote server for the local repository<\/h3>\n
          We need to setup the local repository with the information about the remote repository<\/p>\n
            \n
          1. first clear any settings about the remote server as\n
            $ git remote rm origin<\/pre>\n<\/li>\n
          2. now add the remote server name as\n
            $ git remote add origin ssh:\/\/git@jaya.homelinux.org\/home\/git\/makefiles.git<\/pre>\n<\/li>\n
          3. if you are ready, send all the files to the remote server as\n
            $ git push -u origin master<\/pre>\n
            After this command both the remote and the local repositories are identical. You can either choose to continue working
            \nor delete the local repository and get a copy from the remote<\/li>\n<\/ol>\n
            Working with the project<\/h3>\n
            You would want to have a copy of the entire repository which can be done as follows<\/p>\n
            $ git clone ssh:\/\/git@jaya.homelinux.org\/home\/git\/makefiles.git<\/pre>\n
            Git Branches<\/h3>\n
            the branches that you create are local and then you can send those branches online by pushing the changes to the repository.<\/p>\n
            $git branch <branch_name><\/pre>\n
            will create a branch branch_name for you now we can make a branch active by checkingout that branch<\/p>\n
            $git checkout <branch_name><\/pre>\n
            make sure that the changes on master appear in your new branch as follows<\/p>\n
            $git rebase master<\/pre>\n
            now you can push these changes to the remote branch as follows<\/p>\n
            $git push origin <branch_name><\/pre>\n
            Merge<\/h3>\n
            This is when you are working with a different branch. say you are working with a branch br_9_22_2012 and you want to merge into master.
            \nFirst switch to master<\/p>\n
            $git checkout master<\/pre>\n
            now merge the br_9_22_2012 to the master as follows<\/p>\n
            $git merge br_9_22_2012<\/pre>\n
            now commit this these changes to the source control<\/p>\n
            $git commit -a -m \"merge message\"<\/pre>\n
            Once all the changes are merged to the master, now you can push these to the server as all these changes are local to the disk<\/p>\n
            $git push -u origin master<\/pre>\n","protected":false},"excerpt":{"rendered":"
            How to use Git Create a remote repository Create a local repository Add files to the local repository push the local files to the remote repository Create a remote repository How to setup a git server is in a different page. I’m going to concentrate on how to create a repository in a remote server […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[5],"tags":[],"_links":{"self":[{"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=\/wp\/v2\/posts\/12"}],"collection":[{"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=12"}],"version-history":[{"count":1,"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=\/wp\/v2\/posts\/12\/revisions"}],"predecessor-version":[{"id":13,"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=\/wp\/v2\/posts\/12\/revisions\/13"}],"wp:attachment":[{"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=12"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=12"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/linux.suriyasuneel.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=12"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}