| commit | 8fc293cb1e639c9ea555a8e95e3a7801fc1d1be8 | |
| author | Federico Mena Quintero <federico@novell.com> | |
| Tue, 2 Oct 2007 23:36:30 +0000 (2 18:36 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Oct 2007 00:27:48 +0000 (2 17:27 -0700) | ||
| tree | 15c33ba8dd4f27a8cf1e1dd3131b51b1f9d41bcb | treesnapshot (tar.gz zip) |
| parent | 46749204e97290a0bf20e988d0356f0daba99347 | commitdiff |
Make git-pull complain and give advice when there is nothing to merge with
Signed-off-by: Federico Mena Quintero <federico@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Federico Mena Quintero <federico@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-pull.sh | diffblobblamehistory |