Ryan Kelley rskelley9

## git-rebase.markdown

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              1 star
            
          
                danielnolan
                / git-rebase.markdown
            
            
              Last active
              January 28, 2019 15:36
                — forked from lgmkr/git-rebase.markdown
            
              
                Git rebase workflow
              
          
    Checkout a new working branch

 git checkout -b <branchname>

Make Changes

 git add
 git commit

Update branch

 git checkout <branchname>

git rebase origin/develop

  
## application_controller.rb
class ApplicationController < ActionController::Base …

    private

    def client_will_not_cache_response
        response.headers["Cache-Control”] = “no-cache, no-store”
        response.headers[“Pragma”] = “no-cache”
        response.headers[“Expires”] = “Fri, 01 Jan 1990 00:00:00 GMT”
    end
end

## encryption.rb
require 'openssl'
require "base64"

module Encryption


  class << self
    # create OpenSSL keypair object, used for generated keypair
    def gen_rsa_key(size=2048)
      rsa_key = OpenSSL::PKey::RSA.new(size)
	class ApplicationController < ActionController::Base …

	private

	def client_will_not_cache_response
	response.headers["Cache-Control”] = “no-cache, no-store”
	response.headers[“Pragma”] = “no-cache”
	response.headers[“Expires”] = “Fri, 01 Jan 1990 00:00:00 GMT”
	end
	end
	require 'openssl'
	require "base64"

	module Encryption


	class << self
	# create OpenSSL keypair object, used for generated keypair
	def gen_rsa_key(size=2048)
	rsa_key = OpenSSL::PKey::RSA.new(size)