git-rebase | 易学教程

Insert a commit before the root commit in Git?

阅读更多关于 Insert a commit before the root commit in Git?

问题 I\'ve asked before about how to squash the first two commits in a git repository. While the solutions are rather interesting and not really as mind-warping as some other things in git, they\'re still a bit of the proverbial bag of hurt if you need to repeat the procedure many times along the development of your project. So, I\'d rather go through pain only once, and then be able to forever use the standard interactive rebase. What I want to do, then, is to have an empty initial commit that

Undoing a git rebase

阅读更多关于 Undoing a git rebase

问题 Does anybody know how to easily undo a git rebase? The only way that comes to mind is to go at it manually: git checkout the commit parent to both of the branches then create a temp branch from there cherry-pick all commits by hand replace the branch in which I rebased by the manually-created branch In my current situation this is gonna work because I can easily spot commits from both branches (one was my stuff, the other was my colleague\'s stuff). However my approach strikes me as

In git, what is the difference between merge --squash and rebase?

阅读更多关于 In git, what is the difference between merge --squash and rebase?

问题 I\'m new to git and I\'m trying to understand the difference between a squash and a rebase. As I understand it you perform a squash when doing a rebase. 回答1: Both git merge --squash and git rebase --interactive can produce a "squashed" commit. But they serve different purposes. git merge --squash abranch will produce a squashed commit on the destination branch, without marking any merge relationship. (Note: it does not produce a commit right away: you need an additional git commit -m "squash

Combine the first two commits of a Git repository?

阅读更多关于 Combine the first two commits of a Git repository?

Suppose you have a history containing the three commits A, B and C : A-B-C I would like to combine the two commits A and B to one commit AB : AB-C I tried git rebase -i A which opens up my editor with the following contents: pick e97a17b B pick asd314f C I change this to squash e97a17b B pick asd314f C Then Git 1.6.0.4 says: Cannot 'squash' without a previous commit Is there a way or is this just impossible? kostmo Use git rebase -i --root as of Git version 1.7.12 . In the interactive rebase file, change the second line of commit B to squash and leave the other lines at pick : pick f4202da A

What exactly does git's “rebase --preserve-merges” do (and why?)

阅读更多关于 What exactly does git's “rebase --preserve-merges” do (and why?)

问题 Git\'s documentation for the rebase command is quite brief: --preserve-merges Instead of ignoring merges, try to recreate them. This uses the --interactive machinery internally, but combining it with the --interactive option explicitly is generally not a good idea unless you know what you are doing (see BUGS below). So what actually happens when you use --preserve-merges ? How does it differ from the default behavior (without that flag)? What does it mean to \"recreate\" a merge, etc. 回答1: As

How to remove/delete a large file from commit history in Git repository?

阅读更多关于 How to remove/delete a large file from commit history in Git repository?

问题 Occasionally I dropped a DVD-rip into a website project, then carelessly git commit -a -m ... , and, zap, the repo was bloated by 2.2 gigs. Next time I made some edits, deleted the video file, and committed everything, but the compressed file is still there in the repository, in history. I know I can start branches from those commits and rebase one branch onto another. But what should I do to merge together the 2 commits so that the big file didn\'t show in the history and were cleaned in

When do you use git rebase instead of git merge?

阅读更多关于 When do you use git rebase instead of git merge?

问题 When is it recommended to use git rebase vs. git merge ? Do I still need to merge after a successful rebase? 回答1: Short Version Merge takes all the changes in one branch and merges them into another branch in one commit. Rebase says I want the point at which I branched to move to a new starting point So when do you use either one? Merge Let's say you have created a branch for the purpose of developing a single feature. When you want to bring those changes back to master, you probably want

Delete commits from a branch in Git

阅读更多关于 Delete commits from a branch in Git

问题 I would like to know how to delete a commit. By delete , I mean it is as if I didn\'t make that commit, and when I do a push in the future, my changes will not push to the remote branch. I read git help, and I think the command I should use is git reset --hard HEAD . Is this correct? 回答1: Careful: git reset --hard WILL DELETE YOUR WORKING DIRECTORY CHANGES . Be sure to stash any local changes you want to keep before running this command. Assuming you are sitting on that commit, then this

What's the difference between 'git merge' and 'git rebase'?

阅读更多关于 What's the difference between 'git merge' and 'git rebase'?

What's the difference between git merge and git rebase ? Suppose originally there were 3 commits, A , B , C : Then developer Dan created commit D , and developer Ed created commit E : Obviously, this conflict should be resolved somehow. For this, there are 2 ways: MERGE : Both commits D and E are still here, but we create merge commit M that inherits changes from both D and E . However, this creates diamond shape, which many people find very confusing. REBASE : We create commit R , which actual file content is identical to that of merge commit M above. But, we get rid of commit E , like it