| commit | e7bcdbd38492678fe37f9037f0c450f7b59aafe3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Mar 2009 07:46:35 +0000 (24 00:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Mar 2009 07:46:35 +0000 (24 00:46 -0700) | ||
| tree | 4ba020ce6eb6dbdc5a462543ff99d0d91ececeb1 | treesnapshot (tar.gz zip) |
| parent | 400839c17af8462968a9a73b3107e9c0879f77bf | commitdiff |
| parent | edbc25c5b377d6fe768cefcc8614cd254a9fc4ff | commitdiff |
Merge branch 'master' into next
* master:
refs: use warning() instead of fprintf(stderr, "warning: ")
builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ")
builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
http-push: using error() and warning() as appropriate
Conflicts:
http-push.c
* master:
refs: use warning() instead of fprintf(stderr, "warning: ")
builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ")
builtin-show-branch: use warning() instead of fprintf(stderr, "warning: ")
builtin-rm: use warning() instead of fprintf(stderr, "warning: ")
builtin-init-db: use warning() instead of fprintf(stderr, "warning: ")
builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ")
builtin-checkout: use warning() instead of fprintf(stderr, "warning: ")
builtin-apply: use warning() instead of fprintf(stderr, "warning: ")
http-push: using error() and warning() as appropriate
Conflicts:
http-push.c
| http-push.c | diff1 | diff2 | blobhistory |
| refs.c | diff1 | diff2 | blobhistory |