git-rebase

I had done five commits and I wanted to make them all into one commit before pushing them. For some reason I decided to try doing this by a different means than I usually use. FWIW: I was attempting to follow the instructions here http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html . I'll put a lot of detail below but you might want to skip down to the bottom of the question where I put the output of git reflog because I suspect that's what's significant here. So here's what I did - with all my changes committed I did : git rebase -i HEAD~5 and I was presented with the

I'm using Emacs (23.3.1) on OS X. I'm issuing git commands from a terminal, not using any of Emacs' VC functionality. I have Emacs set up to refresh when files are modified, which is enabled by these lines of my .emacs file: (custom-set-variables ... '(auto-revert-interval 1) ... ) (global-auto-revert-mode 1) This has always worked as I expected; if I pulled, my Emacs buffers would update with the merges or conflicts as if I had quit the buffers and freshly loaded each one. Recently I started rebasing (calling git-fetch and then git-rebase) instead of simply pulling (with git-pull), and I don

git-rebase document says: If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. But how does Git do that? Assume any commit X is the parent of commit Y , and diffXY is the result of git diff X Y command. And I have following commits: o---o---o <- master \ o---o---o---o <- test <- HEAD If I do a git rebase master . Then I guess Git does the skipping commit already have in master by skipping any commit Y in test that diffXY already have in master . I've ran some examples and they were like

I have a local branch ( CRM-ayrshireminis ) that has a couple of commits on it that I have pushed to the origin ( origin/CRM-ayrshireminis ). This branch was created from the develop branch about one week ago, on which there have been one weeks worth of work from other collaborators. What I want to do is rebase the latest code from origin/develop into my feature branch CRM-ayrshireminis . What I done was: git checkout develop git pull git rebase -i develop CRM-ayrshireminis I had two commits, so I squashed them into one and then quit out. I got the message saying Rebasing (2/2) , so it seemed

I'd like to have a hook run after doing git pull --rebase in order to check if a certain file was changed. Something along the lines of this hook. I initially thought of using the post-rewrite hook, however that only works when commits are being rewritten, and won't run when the pull operation simply fast-forwards the branch, which is very often. Any ideas will be appreciated. I ran strace git pull --rebase on a local repository, which performed a fast-forward update... First, rewinding head to replay your work on top of it... Fast-forwarded master to b0a60c3302973ca1878d149d61f2f612c8f27fac.

How would you clean up unused side-branches in your commit trees (not real git branches)? Example (tree, fake-commit-hash, commit message, optional [pointers]): * 0001 last commit [master] [origin/master] [HEAD] | * 0002 old, unused merge |/| * | 0003 some remote commits * | 0004 another commit from remote | * 0005 old, unused commits |/ * 0006 old tree The path 0001, 0003, 0004, 0006 should stay untouched, but the commits 0002 and 0005 are not useful and aren't doing any good. How do you delete the commits 0002 and 0005? erikbwork tarsius wrote in an answer to another question : git reflog

I want to push several single commits to our main git repository. After doing some reading though it sounds like I have to reorder the commits in order to do this, because git will only push all commits up to a specified commit. First, I don't really understand why this isn't just built in to git (I'm a git newbie). Regardless, I need to reorder the commits and I'm using TortoiseGit. I've found how to get to the rebase menu, but I don't know which options to choose. To get to the rebase menu I: Right clicked on the directory and chose TortoiseGit / Show Log Browsed to and selected the commit I