]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ace172 89b9e31)
Merge branch 'tz/notes-error-to-stderr' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:09:04 +0000 (09:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:09:04 +0000 (09:09 -0800)
"git notes" sent its error message to its standard output stream,
which was corrected.

* tz/notes-error-to-stderr:
  notes: send "Automatic notes merge failed" messages to stderr

1  2 
builtin/notes.c patch | diff1 | diff2 | blob | history

diff --cc builtin/notes.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.