Re: [git-users] strange issue related to rebase.

2014-05-13 Thread Felipe Contreras
On Mon, May 12, 2014 at 10:50 PM, Felipe Contreras wrote: > I've been thinking about this and I think it's the wrong thing to do. > I'll disable this "feature" by default in my fork (git-fc). Here it is: https://github.com/felipec/git/commit/0e59c7f2eef2e675098b4412ff0f65f0023126e8 -- Felipe C

Re: [git-users] strange issue related to rebase.

2014-05-12 Thread Felipe Contreras
On Mon, May 12, 2014 at 9:15 AM, wrote: > But I wanted to know what wrong I did here, Why git skipped my commit > silently. I got hit by something like this today. If the issue is the same I got, doing `git merge-base --fork-point origin/master 87f93aa ` should return 87f93aa . If so, most lik

Re: [git-users] strange issue related to rebase.

2014-05-12 Thread Felipe Contreras
On Mon, May 12, 2014 at 1:42 PM, Philip Oakley wrote: >> tabdulradi@radian-XPS:~/workspace/myproject$ git pull --rebase >> remote: Counting objects: 66, done. >> remote: Compressing objects: 100% (60/60), done. >> remote: Total 66 (delta 4), reused 25 (delta 0) >> Unpacking objects: 100% (66/66),

Re: [git-users] strange issue related to rebase.

2014-05-12 Thread Philip Oakley
- Original Message - From: ta...@abdulradi.com To: git-users@googlegroups.com Sent: Monday, May 12, 2014 3:15 PM Subject: [git-users] strange issue related to rebase. I had one commit on my machine, but not on the remote repo yet. I wanted to pull and rebase before

[git-users] strange issue related to rebase.

2014-05-12 Thread tamer
I had one commit on my machine, but not on the remote repo yet. I wanted to pull and rebase before pushing: > tabdulradi@radian-XPS:~/workspace/myproject$ git pull --rebase > remote: Counting objects: 66, done. > remote: Compressing objects: 100% (60/60), done. > remote: Total 66 (delta 4), reuse