squash

问题 I am using the git flow way of managing branches in my repo, as described in: http://nvie.com/posts/a-successful-git-branching-model/ Thus the sequence of commands I should use would be as follows: git checkout mybranch git pull --rebase origin develop git checkout develop git merge --no-ff mybranch However, there is one thing that I would like to do differently, in some cases: I would like to preserve all of my commits on my feature branch ( mybranch ), but have them lumped together (or

问题 I have github branch which I push to github when the master branch reaches some acceptable state (have done this once). To this end I did : MrD@MRSD /c/Dropbox/eclipse_workspaces/android/AndroidMonitoring (master) $ git checkout github Switched to branch 'github' MrD@MRSD /c/Dropbox/eclipse_workspaces/android/AndroidMonitoring (github) $ git merge --squash master Auto-merging src/gr/uoa/di/monitoring/android/services/Monitor.java CONFLICT (add/add): Merge conflict in src/gr/uoa/di/monitoring

问题 I've been using Git Extensions for a while now (it's awesome!) but I haven't found a simple answer to the following: Sometimes, when typing a commit message, a make a typo. My friend showed me how to fix it the following way (in Git Extentions): Right-Click on the commit > Advanced > Fixup commit Then I simply check the box "Amend" and rewrite my message and voila! My commit message is fixed. However this other option "Squash commit"... I have always wondered what it does?! My question is:

问题 while I am working on new code I make many small commits to track my changes. My company however prefers each feature to be committed in a single commit. So the solution is to squash my entire branch down to a single commit. How do I squash an entire branch without using git rebase --interactive and then changing pick to squash for all the commits? 回答1: My preferred method is a two-liner (excluding steps 1 and 4 below). The benefits are you do not need to know/record any commit IDs, you can

问题 I wanted to have a simple solution to squash two merge commits together during an interactive rebase. My repository looks like: X --- Y --------- M1 -------- M2 (my-feature) / / / / / / a --- b --- c --- d --- e --- f (stable) That is, I have a my-feature branch that has been merged twice recently, with no real commits in between. I don't just want to rebase the my-feature branch since it is a published branch of its own, I just want to squash together the last two merge commits into one

问题 This question already has answers here : Squash my last X commits together using Git (32 answers) Closed 2 years ago . I made a pull request on GitHub. Now the owner of the repository is saying to squash all the commits into one. When I type git rebase -i Notepad opens with the following content: noop # Rebase 0b13622..0b13622 onto 0b13622 # # 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

问题 I have a private github repository that needs some work done. When I first started the repository, I was new to git and I was checking in BLOBs and files containing potentially sensitive information. Things have been corrected going forward, but the repository is giant because of the old BLOBs that used to be stored in it, plus, I'm pretty sure that the potentially sensitive information is still in the history. Let's say my commit history looks like this: A -> B -> C -> D -> E -> F -> G -> H

问题 I would like to know how squash all commits of merged branch like this : feature | c3 - merge_master - c6 / / \ master | c1 - c2 - c5 ------------- merge_feature - c7 and I aim to have this master | c1 - c2 - c5 - squash_c3_c6 - c7 I found that git rebase c6 c5 --onto c6 allow me to replay c3 and c6 to have c3' and c6' but I always have c3 and c6 in my history. I must do this in script to process a large repository (over 6k branches !) so I can't use git rebase -i Any idea ? 回答1: You can't

问题 I have a branch like this: A---B---B1---B2---D---E---E1---E2---G---H \ / \ / C1---C2---’ F1---F2---’ I want to rewrite it and make it like this: A---B---B1---B2---D---E---E1---E2---G---H That means, squashing all merges. The branch is very long. How can this be done automatically? Edit This is not a history linearization. I want to squash all merges, like D and G. 回答1: This should do the trick. Since we are cherry picking the commit message, author, and author date will be the same as the

问题 I had a very complicated merge to do. Part of the problem lay that I let too much time pass by so the amount of changes to incorporate into my branch was monstrous. To make things easier, I opted by doing git merge origin/master~20 , then git merge origin/master~17 , git merge origin/master~15 , etc, so I could do the conflict resolutions in a piecemeal fashion instead of having to take it all at once. The problem is tha this lead to a pollution of the log history that I would like to get rid