Ram Rachum <ram.rac...@gmail.com> writes:
>     $ git log  --graph
>     * commit b7a8d7aa001d06eb7491ab5fb447a8dd3aa421a8
>     | Author: Ram Rachum <r...@rachum.com>
>     | Date:   Tue Apr 19 17:45:01 2016 +0300
>     |
>     |     adding more to some-file
>     |
>     *   commit 0aa833916e908ea93902a6c4c227f9a884a1bcef
>     |\  Merge: 2413945 3068c7d
>     | | Author: Ram Rachum <r...@rachum.com>
>     | | Date:   Tue Apr 19 17:44:31 2016 +0300
>     | |
>     | |     Merge branch 'master' into development
>     | |
>     | * commit 3068c7d2548f1798b6840f73b13a649937339f28
>     | | Author: Ram Rachum <r...@rachum.com>
>     | | Date:   Tue Apr 19 16:02:27 2016 +0300
>     | |
>     | |     Adding sugar to coffee
>     | |
>     * | commit 24139451ab954b1f0a9ef616775a3dba0ac81669
>     |/  Author: Ram Rachum <r...@rachum.com>
>     |   Date:   Tue Apr 19 16:01:28 2016 +0300
>     |
>     |       Creating some-file
>     |
>     * commit cf02fbbc40104cd02eea4c7c6f134ef1fd7b5661
>       Author: Ram Rachum <r...@rachum.com>
>       Date:   Tue Apr 19 16:00:47 2016 +0300
>     
>           Create coffee
>
> In the very first commit, the file `coffee` was added. In the commit 
> `3068c7d`, I added a line "sugar" to the `coffee` file. But then I merged 
> this branch into the `development` branch, and in that merge, a mistake was 
> made and the "sugar" line was removed, leaving `coffee` empty. Then another 
> commit `b7a8d7a`, making an unrelated change, was added for good measure. 

> I also tried using `git bisect` to pin down the two commits, but it pointed 
> me to the wrong commit after I finished doing all the `git bisect bad` and 
> `git bisect good` actions.

That seems really unlikely, since there is only one path between 3068
and b7a8.  Can you reproduce the behavior and show us how it happened?

Dale

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to