Merge branch 'jk/maint-pull-dry-run-noop' into maint
commitd0780b0643123dcf68639ac9fc4d79da4e41e6da
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:33 +0000 (21 05:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 12:40:33 +0000 (21 05:40 -0700)
treec82b903ac5b6b3c60a300702e6484d61ea72deb1
parentcb2af93ac183c1a6d5635bb2be047c1ade362099
parent29609e682226acbdaa3340145792b5bd7a1ef5a8
Merge branch 'jk/maint-pull-dry-run-noop' into maint

* jk/maint-pull-dry-run-noop:
  pull: do nothing on --dry-run