On 14 April 2011 16:33, Simon Peyton-Jones <[email protected]> wrote:
> I did ask myself the question "what will 'push' do", but I was unable to find 
> out.
>        git push --dry-run
> was uninformative.

For future reference, "git log" is my go-to command for any query of
this type. If you are on branch master, with configured remote
origin/master then:

  git log origin/master..master

Will show you exactly those commits that would be pushed, should
pushing be possible (since you can only push if it is a fast-forward).

As you point out, Git only allowed you to push in the first place
because you did "git pull origin ghc-generics" while on the master
branch, which caused your locale master branch to be merged with
ghc-generics. If you *just* want to fetch commits, not fetch and then
merge them with your current branch, you should use "git fetch origin
ghc-generics" instead.

Hope that was somewhat informative.

Cheers,
Max

_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to