All Questions
Tagged with git-squash git-branch
9
questions
2
votes
1
answer
99
views
How to have one branch with full history and one branch with squashed history?
I have are requirement that the main branch has only one (potentially big) commit per issue ID. However, to confirm to the best practice of small commits, I also need to create and keep(!) multiple ...
- 4,708
3
votes
2
answers
1k
views
How to squash several commits to another branch?
I will develop my app in branch dev and provide the "best so far" (a release on GitHub) on a branch public.
The branch dev will have commits c964dea, 06cf8ee, 396b4a3 and 9be7fdb. I would ...
- 29.2k
0
votes
1
answer
119
views
Squash a merge commit with the first commit on a branch
I have a commit and a merge commit after it. I want to squash the merge commit with the first commit on the same branch. Can someone explain how this can be done?
Screenshot of git rebase -i -r
- 17
77
votes
6
answers
12k
views
How can I delete all git branches which have been "Squash and Merge" via GitHub?
Ever since GitHub introduced Squash and Merge, all the cool kids at my workplace are using it when merging pull requests. Is there a way to cleanup "Squash and Merge" branches?
The following command ...
- 6,410
4
votes
1
answer
239
views
Find the starting point to do a rebase -i
I am working in a branch (fork of master of course) and I have a series of commits.
I am interested in finding out exactly which commit is the one that is is where the branch started and is part of ...
- 19.3k
1
vote
2
answers
420
views
Push master without feature branches
I've done quite a lot of search on this problem but didn't find an answer, though it seems to be a common scenario. Sorry if it is still a duplicate.
I use Git to manage my Java source files. I'm the ...
- 17
12
votes
3
answers
3k
views
How to squash my git branch commits into the same branch without rebasing?
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 ...
- 95.4k
28
votes
4
answers
22k
views
Squash commits directly on feature without rebase or merge
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 -...
- 20.7k
55
votes
2
answers
36k
views
git merge squash and recurring conflicts
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
...
- 2,807