rebase
Splicing over discontinuities in Mercurial repository timeline
I converted a Subversion repository to Mercurial a few months back and I wound up leaving two meaningless gaps in my revision history. I\'m trying to figure out if I can just splice over the gaps, but[详细]
2023-02-14 04:42 分类:问答How to abort an interactive rebase if --abort doesn't work?
I\'ve got myself into a muddle via an interactive rebase, and I now wish to abort it.(i.e. go back to the point before I was dropped into interactive rebase mode, in my case via git pull --rebase.)The[详细]
2023-02-13 17:30 分类:问答Strange behavior with git fetch
I\'m getting a big problem with GIT fetch...look this $ git fetch From server:project 422b4cb..a04c062master-> origin/master[详细]
2023-02-13 13:10 分类:问答What could cause "number of commits ahead" to change after rebasing?
Before rebasing a feature branch that I hadn\'t touched in a few weeks, it was 25 commits ahead of master. After rebasing, it is now 18 commits. There were several conflicts I had开发者_StackOverflow中[详细]
2023-02-11 18:28 分类:问答Completely remove (old) git commits from history
I\'m starting a project using git where I\'ll be committing very large files, but only a few times a week. I\'ve tried to use git as-is and it seems to store the entire file in each commit where it is[详细]
2023-02-10 11:44 分类:问答git rebase fatal: Needed a single revision
I have a branch of a public repository and I am trying to update my branch with the current commits from the original repository:[详细]
2023-02-06 22:09 分类:问答Rebasing a Git merge commit
Take the following case: I have some work in a topic branch and now I\'m ready to merge back to master:[详细]
2023-02-06 16:35 分类:问答Use git rebase to retroactively make commits land on a different branch?
I have some commits: - 1 - 2 - 3 - 4 - 5 (HEAD, master) Afterwards I notice Commits 2 & 3 really should have gone on their own branch. They are completely independent of commits 4 and 5 Can I[详细]
2023-02-04 02:58 分类:问答Recovering from a failed rebase
I\'m using git svn to get some git goodness with the company-mandated svn server. I just had a rebase go horribly awry, and I\"m trying to figure out the best way to recover.[详细]
2023-02-03 21:28 分类:问答git svn dcommit without rebasing
Our company uses (and supports!) SVN, but I tend to use git. What I want to try is to have git repository - one per project, project developers will be able to pull from this repository (and of course[详细]
2023-02-03 17:37 分类:问答