]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9279bf3 12dd111)
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
Unnamed repository; edit this file 'description' to name the repository.