Styjun

How to pronounce 'c++' in Spanish

How to denote matrix elements succinctly?

"Whatever a Russian does, they end up making the Kalashnikov gun"? Are there any similar proverbs in English?

Why did some of my point & shoot film photos come back with one third light white or orange?

I preordered a game on my Xbox while on the home screen of my friend's account. Which of us owns the game?

What is the optimal strategy for the Dictionary Game?

Contradiction proof for inequality of P and NP?

Is there any official lore on the Far Realm?

How to fry ground beef so it is well-browned

How can I get this effect? Please see the attached image

Is it idiomatic to construct against `this`

Extension of 2-adic valuation to the real numbers

Like totally amazing interchangeable sister outfits II: The Revenge

Elements that can bond to themselves?

What term is being referred to with "reflected-sound-of-underground-spirits"?

Minor Revision with suggestion of an alternative proof by reviewer

Do I have an "anti-research" personality?

bldc motor, esc and battery draw, nominal vs peak

Why did C use the -> operator instead of reusing the . operator?

Can SQL Server create collisions in system generated constraint names?

How did Captain America manage to do this?

"You've called the wrong number" or "You called the wrong number"

Was there a shared-world project before "Thieves World"?

What happened to Captain America in Endgame?

Is there a way to non-interactively rebase and squash everything in my feature branch?

How to squash/rebase in a single shotGit for beginners: The definitive practical guideWhen would you use the different git merge strategies?Git workflow and rebase vs merge questionsHow to remove/delete a large file from commit history in Git repository?How can I merge two commits into one if I already started rebase?Find the parent branch of a Git branchMerge all changes from another branch as a single commitHow can I reconcile detached HEAD with master/origin?Git push rejected after feature branch rebaseGit merge master into feature branch

.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty height:90px;width:728px;box-sizing:border-box;

1

Sometimes I have a bunch of small commits in a feature branch, and I'd like to just squash them all together, but not merge into the parent branch yet.

I know I can (in this example parent branch is master):

git rebase -i master

and then tag all of the commits after the first as "squash".

Is there a way to get the same result non-interactively?

Essentially I want to create a new commit whose tree is identical to the tree now at the head of my feature branch and whose parent is the ancestor commit that I've specified (eg: master), and then change the feature branch to point at that new commit. There should never be any conflicts (I occasionally get some with rebase -i), and with -m should be completely non-interactive. Ideally, without -m the commit message should default to a concatenation of the commits being squashed.

How can I do this?

git git-rebase git-squash

share|improve this question

edited Mar 22 at 18:01

Laurence Gonsalves

asked Mar 22 at 17:31

Laurence GonsalvesLaurence Gonsalves

105k27190238

add a comment | 

1

Sometimes I have a bunch of small commits in a feature branch, and I'd like to just squash them all together, but not merge into the parent branch yet.

I know I can (in this example parent branch is master):

git rebase -i master

and then tag all of the commits after the first as "squash".

Is there a way to get the same result non-interactively?

Essentially I want to create a new commit whose tree is identical to the tree now at the head of my feature branch and whose parent is the ancestor commit that I've specified (eg: master), and then change the feature branch to point at that new commit. There should never be any conflicts (I occasionally get some with rebase -i), and with -m should be completely non-interactive. Ideally, without -m the commit message should default to a concatenation of the commits being squashed.

How can I do this?

git git-rebase git-squash

share|improve this question

edited Mar 22 at 18:01

Laurence Gonsalves

asked Mar 22 at 17:31

Laurence GonsalvesLaurence Gonsalves

105k27190238

add a comment | 

Sometimes I have a bunch of small commits in a feature branch, and I'd like to just squash them all together, but not merge into the parent branch yet.

I know I can (in this example parent branch is master):

git rebase -i master

and then tag all of the commits after the first as "squash".

Is there a way to get the same result non-interactively?

Essentially I want to create a new commit whose tree is identical to the tree now at the head of my feature branch and whose parent is the ancestor commit that I've specified (eg: master), and then change the feature branch to point at that new commit. There should never be any conflicts (I occasionally get some with rebase -i), and with -m should be completely non-interactive. Ideally, without -m the commit message should default to a concatenation of the commits being squashed.

How can I do this?

git git-rebase git-squash

share|improve this question

edited Mar 22 at 18:01

Laurence Gonsalves

asked Mar 22 at 17:31

Laurence GonsalvesLaurence Gonsalves

105k27190238

git rebase -i master

share|improve this question

edited Mar 22 at 18:01

Laurence Gonsalves

asked Mar 22 at 17:31

Laurence GonsalvesLaurence Gonsalves

105k27190238

share|improve this question

edited Mar 22 at 18:01

Laurence Gonsalves

asked Mar 22 at 17:31

Laurence GonsalvesLaurence Gonsalves

105k27190238

asked Mar 22 at 17:31

Laurence GonsalvesLaurence Gonsalves

105k27190238

asked Mar 22 at 17:31

Laurence GonsalvesLaurence Gonsalves

105k27190238

1 Answer
1

active

oldest

votes

4

My take to squash is to use git reset --soft. Say you want to squash the last 5 commits:

git reset --soft HEAD~5
git commit -m "Feature X"

And if you also want to rebase all of that done in a (almost) single shot, you can still do it with git reset --soft

How to squash/rebase in a single shot

share|improve this answer

edited Mar 22 at 17:37

answered Mar 22 at 17:32

eftshift0eftshift0

6,0151022

• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Is it possible to use the parent branch name in place of counting commits? eg: can I "git reset --soft master", or will that have some unintended side-effect?
  
  – Laurence Gonsalves
  Mar 22 at 17:59
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  You mean, in the basic recipe to "only" squash? You could try using a trick to find the last common ancestor: git reset --soft $( git merge-base HEAD master ) (if master is your parent branch). That way you don't need to count revisions
  
  – eftshift0
  Mar 22 at 18:02
  
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  I mean in the case where master is an ancestor already (ie: git rebase master would do nothing), and I just want to squash everything between master and HEAD, but remain on current-branch. Wouldn't git reset --soft master just move current-branch to point at the same commit as master, and then we can commit everything in the working tree to make our "squashed" commit? Or does using master in place of HEAD~5 trigger some other behavior in git reset?
  
  – Laurence Gonsalves
  Mar 22 at 18:41
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Wait.... what? git rebase master would definitely do something if master has moved past the point where you started development of the feature branch (as in: both branches diverged). git reset --soft masterwould take it to the right spot in order to squash iif master hasn't moved after the feature branch started. Given that I don't know, i didn't make that assumption and that's why I provided the merge-base command to find that point where the branches might have diverged.
  
  – eftshift0
  Mar 22 at 18:50
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Once master has "moved past the point where you started development of the feature branch" it isn't an ancestor of the feature branch anymore, is it?
  
  – Laurence Gonsalves
  Mar 22 at 19:02
  

  
  
  
  

 | 
show 4 more comments

Your Answer

StackExchange.ifUsing("editor", function ()
StackExchange.using("externalEditor", function ()
StackExchange.using("snippets", function ()
StackExchange.snippets.init();
);
);
, "code-snippets");

StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "1"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);

StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);

else
createEditor();

);

function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);



);

draft saved

draft discarded

Sign up or log in

StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);

Sign up using Google

Sign up using Facebook

Sign up using Email and Password

Post as a guest

Name

Email

Required, but never shown

StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55304962%2fis-there-a-way-to-non-interactively-rebase-and-squash-everything-in-my-feature-b%23new-answer', 'question_page');

);

Post as a guest

Name

Email

Required, but never shown

4

My take to squash is to use git reset --soft. Say you want to squash the last 5 commits:

git reset --soft HEAD~5
git commit -m "Feature X"

And if you also want to rebase all of that done in a (almost) single shot, you can still do it with git reset --soft

How to squash/rebase in a single shot

share|improve this answer

edited Mar 22 at 17:37

answered Mar 22 at 17:32

eftshift0eftshift0

6,0151022

• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Is it possible to use the parent branch name in place of counting commits? eg: can I "git reset --soft master", or will that have some unintended side-effect?
  
  – Laurence Gonsalves
  Mar 22 at 17:59
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  You mean, in the basic recipe to "only" squash? You could try using a trick to find the last common ancestor: git reset --soft $( git merge-base HEAD master ) (if master is your parent branch). That way you don't need to count revisions
  
  – eftshift0
  Mar 22 at 18:02
  
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  I mean in the case where master is an ancestor already (ie: git rebase master would do nothing), and I just want to squash everything between master and HEAD, but remain on current-branch. Wouldn't git reset --soft master just move current-branch to point at the same commit as master, and then we can commit everything in the working tree to make our "squashed" commit? Or does using master in place of HEAD~5 trigger some other behavior in git reset?
  
  – Laurence Gonsalves
  Mar 22 at 18:41
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Wait.... what? git rebase master would definitely do something if master has moved past the point where you started development of the feature branch (as in: both branches diverged). git reset --soft masterwould take it to the right spot in order to squash iif master hasn't moved after the feature branch started. Given that I don't know, i didn't make that assumption and that's why I provided the merge-base command to find that point where the branches might have diverged.
  
  – eftshift0
  Mar 22 at 18:50
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Once master has "moved past the point where you started development of the feature branch" it isn't an ancestor of the feature branch anymore, is it?
  
  – Laurence Gonsalves
  Mar 22 at 19:02
  

  
  
  
  

 | 
show 4 more comments

4

My take to squash is to use git reset --soft. Say you want to squash the last 5 commits:

git reset --soft HEAD~5
git commit -m "Feature X"

And if you also want to rebase all of that done in a (almost) single shot, you can still do it with git reset --soft

How to squash/rebase in a single shot

share|improve this answer

edited Mar 22 at 17:37

answered Mar 22 at 17:32

eftshift0eftshift0

6,0151022

• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Is it possible to use the parent branch name in place of counting commits? eg: can I "git reset --soft master", or will that have some unintended side-effect?
  
  – Laurence Gonsalves
  Mar 22 at 17:59
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  You mean, in the basic recipe to "only" squash? You could try using a trick to find the last common ancestor: git reset --soft $( git merge-base HEAD master ) (if master is your parent branch). That way you don't need to count revisions
  
  – eftshift0
  Mar 22 at 18:02
  
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  I mean in the case where master is an ancestor already (ie: git rebase master would do nothing), and I just want to squash everything between master and HEAD, but remain on current-branch. Wouldn't git reset --soft master just move current-branch to point at the same commit as master, and then we can commit everything in the working tree to make our "squashed" commit? Or does using master in place of HEAD~5 trigger some other behavior in git reset?
  
  – Laurence Gonsalves
  Mar 22 at 18:41
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Wait.... what? git rebase master would definitely do something if master has moved past the point where you started development of the feature branch (as in: both branches diverged). git reset --soft masterwould take it to the right spot in order to squash iif master hasn't moved after the feature branch started. Given that I don't know, i didn't make that assumption and that's why I provided the merge-base command to find that point where the branches might have diverged.
  
  – eftshift0
  Mar 22 at 18:50
  

  
  
  
  


• 
  
  
  

  
  

  
  
  
  
  
  

  
  
  Once master has "moved past the point where you started development of the feature branch" it isn't an ancestor of the feature branch anymore, is it?
  
  – Laurence Gonsalves
  Mar 22 at 19:02
  

  
  
  
  

 | 
show 4 more comments

My take to squash is to use git reset --soft. Say you want to squash the last 5 commits:

git reset --soft HEAD~5
git commit -m "Feature X"

And if you also want to rebase all of that done in a (almost) single shot, you can still do it with git reset --soft

How to squash/rebase in a single shot

share|improve this answer

edited Mar 22 at 17:37

answered Mar 22 at 17:32

eftshift0eftshift0

6,0151022

git reset --soft HEAD~5
git commit -m "Feature X"

share|improve this answer

edited Mar 22 at 17:37

answered Mar 22 at 17:32

eftshift0eftshift0

6,0151022

answered Mar 22 at 17:32

eftshift0eftshift0

6,0151022

answered Mar 22 at 17:32

eftshift0eftshift0

6,0151022