Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.6.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 08:40:19 +0000 (00:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 08:40:19 +0000 (00:40 -0800)
* maint-1.6.0:
Avoid spurious error messages on error mistakes.
contrib/examples/README: give an explanation of the status of these files

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history
diff --cc git-rebase--interactive.sh
Simple merge