Merge branch 'fg/submodule-ff-check-before-push'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:07:58 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:07:58 +0000 (13:07 -0700)
* fg/submodule-ff-check-before-push:
  push: Don't push a repository with unpushed submodules

1  2 
Documentation/git-push.txt
submodule.c
transport.c

Simple merge
diff --cc submodule.c
Simple merge
diff --cc transport.c
Simple merge