Local images

2016-10-18-Basic-Git-Commands.md

@@ -0,0 +1,91 @@
+---
+layout: post
+title: Basic Git Commands
+comment: true
+---
+
+In this post, I talk about some of the most common git commands that I use. It is my version of the Git cheat sheet.
+
+## Creating a repository
+
+Initializes an empty repository in the current directory.
+
+	git init
+
+## Adding files
+
+Adding the files, either one at a time or all the files
+
+	git add *
+	git add file-name
+
+## Current status of Git
+
+Details on current repository, whether any files needs to be checked in, etc.
+
+	git status
+
+## Committing changes
+
+	git commit -m "message"
+
+Listing all changes to repository
+
+	git log
+
+## Branching information
+
+### List details of the current repository branch.
+
+	git branch -a
+
+### Create a new branch
+This will create a new branch. If a branch already exists, it simply throws an error.
+
+	git checkout -b development
+
+### Switch branch
+
+	git checkout development
+
+### Merge a branch
+Assuming the user wants to merge "development" to "master", this will work. The __"--no-ff"__ option will
+
+	git merge development --no-ff
+
+## Working with tags
+### Listing the tags
+Lists all the existing tags
+
+	git tag
+
+### Creating a simple tag
+This will create a tag but have no information about it.
+
+	git tag tag1
+
+### Creating an annotated tag
+This will add more info when creating the tag.
+
+	git tag -a v1 -m "Version 1.0 release"
+
+### Show the details of a tag
+This will show the last committed details and the files that are present in a tag.
+
+	git show tag1
+
+## Git Pull
+Git pull is a bit more complex command. It is used when there are multiple developers but one authorized person responsible to merge the code. In this case, all the develpers make their change and create a __pull__ request. It is like the developer telling the commitor to review and merge the change if it passes the acceptance criteria.
+
+For git pull to work, you will need to do the following:
+* Create a branch
+* Make changes to the branch
+* Add and commit the changes
+* Push the change to the remote repository 
+* Now, request a git pull on the branch name
+
+Suppose the branch created is bug-fix-2001 the command would be:
+
+	git pull bug-fix-2001
+
+The code reviewer will be notified and they can take further action.

_config.yml

@@ -3,14 +3,27 @@
 #
 
 # Name of your site (displayed in the header)
-name: Your Name
+name: Akshay Ranganath's Blogs
+author: rakshay 
+
+
+#adding twitter details
+twitter:
+  site: Akshay Ranganath's Blogs
+  username: rakshay
 
 # Short bio or description (displayed in the header)
-description: Web Developer from Somewhere
+description: Blogs about Media Optimization, Web Performance, SEO and web technology.
+tagline: Musings from a Tech Entrepreneur
+
+paginate: 8
+paginate_path: '/blog/page:num'
 
 # URL of your avatar or profile pic (you could use your GitHub profile pic)
-avatar: https://raw.githubusercontent.com/barryclark/jekyll-now/master/images/jekyll-logo.png
+avatar: /images/blog/github_profile.jpg
 
+
+logo: /images/blog/github_profile.jpg
 #
 # Flags below are optional
 #
@@ -21,27 +34,27 @@ footer-links:
   email:
   facebook:
   flickr:
-  github: barryclark/jekyll-now
+  github: akshayranganath
   instagram:
-  linkedin:
+  linkedin: akshayranganath
   pinterest:
-  rss: # just type anything here for a working RSS icon
-  twitter: jekyllrb
+  rss: rss # just type anything here for a working RSS icon
+  twitter: rakshay
   stackoverflow: # your stackoverflow profile, e.g. "users/50476/bart-kiers"
   youtube: # channel/<your_long_string> or user/<user-name>
   googleplus: # anything in your profile username that comes after plus.google.com/
 
 
 # Enter your Disqus shortname (not your username) to enable commenting on posts
 # You can find your shortname on the Settings page of your Disqus account
-disqus:
+# disqus: akshayranganath
 
 # Enter your Google Analytics web tracking code (e.g. UA-2110908-2) to activate tracking
-google_analytics:
+google_analytics: UA-92984102-1
 
 # Your website URL (e.g. http://barryclark.github.io or http://www.barryclark.co)
 # Used for Sitemap.xml and your RSS feed
-url:
+url: https://akshayranganath.github.io
 
 # If you're hosting your site at a Project repository on GitHub pages
 # (http://yourusername.github.io/repository-name)
@@ -70,12 +83,15 @@ kramdown:
 
 # Set the Sass partials directory, as we're using @imports
 sass:
-  style: :expanded # You might prefer to minify using :compressed
+  style: :compressed #:expanded # You might prefer to minify using :compressed
 
 # Use the following plug-ins
 gems:
   - jekyll-sitemap # Create a sitemap using the official Jekyll sitemap gem
   - jekyll-feed # Create an Atom feed using the official Jekyll feed gem
+  - jekyll-seo-tag # Add SEO related tags and JSON-LD
+  - jekyll-paginate # Adding pagination capability
+  - jekyll-redirect-from #redirect functionalit
 
 # Exclude these files from your production _site
 exclude:
@@ -84,3 +100,28 @@ exclude:
   - LICENSE
   - README.md
   - CNAME
+
+# inspired by https://github.com/codinfox/codinfox-lanyon
+# Adding category and tags support
+categories:
+  type: liquid
+  path: /categories/
+tags:
+  type: liquid
+  path: /tags/
+
+nav:
+  Home:           
+    - '/'
+  Blog:           
+    - '/blog/'
+    - { Categories: '/blog/categories/' }
+    - { Tags: '/blog/tags/' }
+  About:          
+    - '/about/'
+  Github Project: 
+    - 'http://akshayranganath.github.io/'
+
+# Where are tags and categories displayed
+tag_page: '/blog/tags/'
+category_page: '/blog/categories/'

_includes/analytics.html

@@ -1,16 +1,13 @@
 {% if site.google_analytics %}
 	<!-- Google Analytics -->
+	<!-- Global site tag (gtag.js) - Google Analytics -->
+	<script async src="https://www.googletagmanager.com/gtag/js?id=UA-92984102-1"></script>
 	<script>
-		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+	  window.dataLayer = window.dataLayer || [];
+	  function gtag(){dataLayer.push(arguments);}
+	  gtag('js', new Date());
 
-		ga('create', '{{ site.google_analytics }}', 'auto');
-		ga('send', 'pageview', {
-		  'page': '{{ site.baseurl }}{{ page.url }}',
-		  'title': '{{ page.title | replace: "'", "\\'" }}'
-		});
+	  gtag('config', 'UA-92984102-1');
 	</script>
 	<!-- End Google Analytics -->
 {% endif %}

_includes/disqus.html

@@ -1,17 +1,17 @@
 {% if site.disqus %}
 <div class="comments">
-	<div id="disqus_thread"></div>
-	<script type="text/javascript">
-
-	    var disqus_shortname = '{{ site.disqus }}';
-
-	    (function() {
-	        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-	        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-	        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-	    })();
-
-	</script>
-	<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+	<script defer>
+        <div id="disqus_thread"></div>
+        var disqus_config = function () {
+			this.page.url = '{{ site.disqus }}';  // Replace PAGE_URL with your page's canonical URL variable
+			this.page.identifier = '{{ site.disqus }}'; // Replace PAGE_IDENTIFIER with your page's unique identifier variable
+		};
+		(function() { // DON'T EDIT BELOW THIS LINE
+		var d = document, s = d.createElement('script');
+		s.src = 'https://EXAMPLE.disqus.com/embed.js';
+		s.setAttribute('data-timestamp', +new Date());
+		(d.head || d.body).appendChild(s);
+		})();
+	</script>		
 </div>
 {% endif %}

_includes/meta.html

@@ -2,17 +2,8 @@
     <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
     <meta http-equiv='X-UA-Compatible' content='IE=edge'>
     <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0'>
-
-    {% if page.excerpt %}
-    <meta name="description" content="{{ page.excerpt| strip_html }}" />
-    <meta property="og:description" content="{{ page.excerpt| strip_html }}" />
-    {% else %}
-    <meta name="description" content="{{ site.description }}">
-    <meta property="og:description" content="{{ site.description }}" />
-    {% endif %}
-    <meta name="author" content="{{ site.name }}" />
-
-    {% if page.title %}
-    <meta property="og:title" content="{{ page.title }}" />
-    <meta property="twitter:title" content="{{ page.title }}" />
-    {% endif %}
+    <meta name="msvalidate.01" content="815C82C74ED363E419486F6A1DA557B9" />
+    {% seo title=false %}
+    <!-- testing the PWA code -->
+    <link rel="manifest" href="/manifest.json" >
+    <meta name=theme-color content=#0000ff>   

_layouts/default.html

@@ -1,14 +1,15 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
-    <title>{% if page.title %}{{ page.title }} – {% endif %}{{ site.name }} – {{ site.description }}</title>
+    <title>{% if page.title %}{{ page.title }} – {% endif %}{{ site.name }}</title>
 
     {% include meta.html %}
 
     <!--[if lt IE 9]>
       <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
+    <link rel="shortcut icon" href="/images/icon_64.ico">
     <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/style.css" />
     <link rel="alternate" type="application/rss+xml" title="{{ site.name }} - {{ site.description }}" href="{{ site.baseurl }}/feed.xml" />
 
@@ -44,8 +45,7 @@ <h1 class="site-name"><a href="{{ site.baseurl }}/">{{ site.name }}</a></h1>
           {% include svg-icons.html %}
         </footer>
       </div>
-    </div>
-
+    </div>       
     {% include analytics.html %}
   </body>
 </html>

_layouts/page.html

@@ -1,6 +1,17 @@
 ---
 layout: default
 ---
+<script type="application/ld+json">{
+"@context": "http://schema.org",
+"@type": "Blog",
+"name": "{{ site.name }}",
+"url": "{{ site.url }}",
+"description": "{{ site.desciption }}",
+"publisher": {
+"@type": "{{ site.name }}",
+"name": "{{ site.author }}"
+}
+}</script>
 
 <article class="page">
 
@@ -9,4 +20,4 @@ <h1>{{ page.title }}</h1>
   <div class="entry">
     {{ content }}
   </div>
-</article>
+</article>      

_layouts/post.html

@@ -1,17 +1,13 @@
 ---
 layout: default
 ---
-
 <article class="post">
   <h1>{{ page.title }}</h1>
-
-  <div class="entry">
-    {{ content }}
-  </div>
-
   <div class="date">
     Written on {{ page.date | date: "%B %e, %Y" }}
   </div>
-
+  <div class="entry">
+    {{ content }}
+  </div>  
   {% include disqus.html %}
 </article>