I always prefer to rebase -i my changes locally and leave a very clean and useful commit history for my feature branches. This also have the benefit of being able to prune local/remote branches aft...

What is the difference between amend and squash commands? I tried both and found that both are doing the same for proper management.

I have created 2 commits to remote dev branch. That I squashed and merge into remote master branch. Now when I want to continue with working on dev branch - I don't know how can I correctly "repai...

I have a merge request with 5 commits, all pushed to the branch on GitLab. I'd like to squash those 5 commits into 1 -- but there are intermediate commits to the repo by other people. E.g.,in git l...

I have a remote Git server, here is the scenario which I want to perform: For each bug/feature I create a different Git branch I keep on committing my code in that Git branch with un-official Git...

I cannot find the documentation about the several options (checkboxes) that are visible when commiting. I'm looking for an option to squash all commits from the IDE, and I'm wondering if one of ...

I've been reading a little about --squashing commits, but they all seem to be go hand in hand with a --rebase. I have a feature branch with a set of commits like this: (Feature) A --> B -->...

I have a git repository with master and alt branches. alt branch contains modified version of master code, and i am trying to merge changes from master to alt like this: git merge --squash master ...

I created a simple folder with a file and performed few commits for practicing squash. I selected two commits and right click. However, the squash commit option is disabled. Where am I going wrong?...

When using Git inside of IntelliJ, how do I squash all of my commits for a local branch? What settings do I use in the rebase branch window? I've tried setting the Onto to local/master and From to ...

I have the following scenario: Master-branch: what is in production, can contain hotfixes Develop-branch: the branch my developers are using to create pull requests to feature-branches: the branc...

I use an optimistic work-flow in Gitlab, which assumes the majority of my merge requests will be accepted without change. The flow looks like this: Submit a merge request for branch cool-feature-...

A developer recently left who left a ton of commits in a repo from a few months ago that are just like 'updated'. Ideally, I'd like to squash them into a single commit but I have only done this for...

Our team is deciding on what merge strategy to use in our repo. We're looking at squash merges for the ability to have a clean commit history. However, we want to be able to review intermediate cha...

For some projects I do or work on sometimes it is usually best that we squash/rebase all changes into a single commit. However, I was wondering how this affects the contributions page on github. F...

I'm working on a git repository which I forked from an upstream. There was a feature I wanted to implement and I created a new branch uiTests and did changes there and made a pull request. The PR ...

I have tried multiple ways to squash my remote repo commits but didnt get it right. I want to squash them all and make it one . Below is the list of commits. Below is the summary of my pull request...

I'm fairly new to git, so I've been trying to figure out how to squash 3 commits into 1 so my PR can get merged. I've read a lot of docs and guides and sort of found out how to squash commits but o...

Imagine a git repository with the following commits: Fixed issue 3 123eabc Fixed issue 2 (part 2) fa23b79 Fixed issue 2 (part 1) 7bea5cc Fixed issue 1 0d229f4 These are all pushed to remote mast...

Let's say I've developed a feature on branch1 and sent it out for code review using a GitHub Pull Request. While it's being reviewed, I do some follow-on work on branch2. branch2 -> D --> E...

So GitHub has the ability to merge+squash commits for a PR. We follow the process of PR'ing code from dev -> master. Previously, I've been just 'merging' the PR's but that generates a new commit ...

I have a bunch of commits on my local repository which are thematically similar. I'd like to combine them into a single commit before pushing up to a remote. How do I do it? I think rebase do...

I want to squash several commits together in the middle of a branch without modifying the commits before and after. I have : A -- B -- C -- D -- E -- F -- G | | master dev origin/master I want ...

I have a local branch, we're using git-flow with Pull Requests and I'm looking to squash a few commits after receiving PR feedback. How can I squash all my commits (from PR's for example) into the...

Initial scenario: A (master) \ B - C - D (development) What I want after merge --squash: A - E (master/development) \ / B - C - D On branch master, git log would be commit E Squashed c...