Git: How to Squash your commits into one commit before merging

When you are doing a feature development, typically there are many local commits which happen, its always a good idea that squash all those commits into one commit and then merge them to the master branch.

Below are the steps to do the same
#Step1 : Start git rebase in interactive mode
$ git rebase -i master
#once you do this, you will all your commits in an editor likewise

pick 1b6f7fed87 feature1
pick 1b6f7fed85 old commit1
pick 1b6f7fed83 old commit2
pick 1b6f7fed81 old commit3

# Rebase 806f77feab..1b6f7fed87 onto 806f77feab (1 command)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out


Step3: now replace all the commits with pick to f except the top commit,
likewise 
pick 1b6f7fed87 feature1
f 1b6f7fed85 old commit1
f 1b6f7fed83 old commit2
f 1b6f7fed81 old commit3

and save the file, voila, you have successfully squashed the commits into one

Comments

Post a Comment

Popular posts from this blog

Apache Airflow Wait Between Tasks

 Apache Airflow allows you to create custom workflows that can be triggered on a recurring basis at specific time intervals based on your needs. Some concepts to learn are DAGs - this defines the entire workflow Tasks - are the Individual tasks that constitute the workflow Operators - This is an airflow-specific concept, which needs to be understood, Based on what type of tasks you would like to perform there are multiple operators. To run a bash script there is a BashOperator, to run a python code you need to have a Python Operator. For more details, refer  https://airflow.apache.org/docs/apache-airflow/stable/concepts/index.html Above 3 are sufficient to get started, ofcourse there are others like interprocess communication, variables, process dependency management, etc. Let's Define a Simple Workflow we want to achieve DAG = Tasks1 >> Wait for a Day >> Task2 Above is the DAG, where two tasks are executed, second task depends on first task and is executed afte...
Read more

Hadoop Installation Overview – Part1 – Single Node

Hadoop Installation Overview – Single Node Part1 Overview This is the part1 of Hadoop installation document, We will be covering installing hadoop on a Single VM enviroment. Both namenode and datanode will run on the same VM. Assumption This document assumes that VMWare box is already installed on your machine, check below link to install install vmware workstation on vmware Install ubuntu 12.0.4 LTS, download the .iso file and install it. install ubuntu Installation Steps Step1 Install VMWare Workstation, as mentioned above Step2 Install ubuntu , as mentioned above. **Note – Make sure you select the 32bit or 64bit version based on your windows version Step3 Install OS Updates for ubuntu. Go to Terminal and type $ sudo apt-get update Step4 Install OpenJDK6. Since hadoop is all java we need the JDK. $apt-get install openjdk-6-jdk Step5 Install Eclipse. From UI go to software center and install eclipse Step6 Open SSH Server sudo apt-get ...
Read more

Java J2EE Security Considerations

Java Application Security Considerations   1. Authentication Insecure Coding Practices Secure Coding Practices Concatenated SQL queries for login validation. In most cases it is seen that user credentials, as retrieved from the request is used to form concatenated login queries. Such instances result in injection flaws in the login page. In case of concatenated SQL query, it leads to SQL Injection vulnerability. String  username =request.getParameter(“username”); String  password =request.getParameter(“password”); String query = “SELECT * FROM users WHERE username = “+ username +” AND password=”+ password ; Statement st = con. createStatement(); Results res = st.executeQuery(query); Use Parameterized or pre-compiled queries. String username=request.getParameter(“username”); String password=request.getParameter(“password”); String query = “SELECT * FROM users WHERE  username =?  AND  password=? “; PreparedStatement  ps = con.prepareStatement(query); ps....
Read more