How to squash commits from previous pushes to pull request?
When I type git log, I only get the last 4 commits which came after my last push. I can squash these but the problem is that I have had multiple pushes for this pull request, each with multiple commits. I need to somehow access all of these commits and squash them into one commit. This is on BitBucket but I would prefer the terminal commands.
git
asked Nov 20 '18 at 3:32
janiceFromTheOfficejaniceFromTheOffice
344
add a comment |
When I type git log, I only get the last 4 commits which came after my last push. I can squash these but the problem is that I have had multiple pushes for this pull request, each with multiple commits. I need to somehow access all of these commits and squash them into one commit. This is on BitBucket but I would prefer the terminal commands.
git
asked Nov 20 '18 at 3:32
janiceFromTheOfficejaniceFromTheOffice
344
add a comment |
When I type git log, I only get the last 4 commits which came after my last push. I can squash these but the problem is that I have had multiple pushes for this pull request, each with multiple commits. I need to somehow access all of these commits and squash them into one commit. This is on BitBucket but I would prefer the terminal commands.
git
asked Nov 20 '18 at 3:32
janiceFromTheOfficejaniceFromTheOffice
344
When I type git log, I only get the last 4 commits which came after my last push. I can squash these but the problem is that I have had multiple pushes for this pull request, each with multiple commits. I need to somehow access all of these commits and squash them into one commit. This is on BitBucket but I would prefer the terminal commands.
git
git
asked Nov 20 '18 at 3:32
janiceFromTheOfficejaniceFromTheOffice
344
asked Nov 20 '18 at 3:32
janiceFromTheOfficejaniceFromTheOffice
344
asked Nov 20 '18 at 3:32
janiceFromTheOfficejaniceFromTheOffice
344
asked Nov 20 '18 at 3:32
janiceFromTheOfficejaniceFromTheOffice
344
asked Nov 20 '18 at 3:32
janiceFromTheOfficejaniceFromTheOffice
344
344
add a comment |
add a comment |
1 Answer
1
active
oldest
votes
You could squash all commits of a PR branch, then force push that branch.
But:
You can squash when merging your PR. That avoids having to do any local operation.
That feature is available on:
- GitHub since 2016
- BitBucket since 2017
See more at "Why You Should Care About Squash and Merge in Git"
answered Nov 20 '18 at 5:53
VonCVonC
843k29426713223
add a comment |
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
});
}
});
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
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53385820%2fhow-to-squash-commits-from-previous-pushes-to-pull-request%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
You could squash all commits of a PR branch, then force push that branch.
But:
You can squash when merging your PR. That avoids having to do any local operation.
That feature is available on:
- GitHub since 2016
- BitBucket since 2017
See more at "Why You Should Care About Squash and Merge in Git"
answered Nov 20 '18 at 5:53
VonCVonC
843k29426713223
add a comment |
You could squash all commits of a PR branch, then force push that branch.
But:
You can squash when merging your PR. That avoids having to do any local operation.
That feature is available on:
- GitHub since 2016
- BitBucket since 2017
See more at "Why You Should Care About Squash and Merge in Git"
answered Nov 20 '18 at 5:53
VonCVonC
843k29426713223
add a comment |
You could squash all commits of a PR branch, then force push that branch.
But:
You can squash when merging your PR. That avoids having to do any local operation.
That feature is available on:
- GitHub since 2016
- BitBucket since 2017
See more at "Why You Should Care About Squash and Merge in Git"
answered Nov 20 '18 at 5:53
VonCVonC
843k29426713223
You could squash all commits of a PR branch, then force push that branch.
But:
You can squash when merging your PR. That avoids having to do any local operation.
That feature is available on:
- GitHub since 2016
- BitBucket since 2017
See more at "Why You Should Care About Squash and Merge in Git"
answered Nov 20 '18 at 5:53
VonCVonC
843k29426713223
answered Nov 20 '18 at 5:53
VonCVonC
843k29426713223
answered Nov 20 '18 at 5:53
VonCVonC
843k29426713223
answered Nov 20 '18 at 5:53
VonCVonC
843k29426713223
843k29426713223
add a comment |
add a comment |
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
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
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53385820%2fhow-to-squash-commits-from-previous-pushes-to-pull-request%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
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
Required, but never shown
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
Required, but never shown
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
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
