diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-26 14:12:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-26 14:12:07 -0800 |
| commit | 77b598b438e51d45229fe945e2139a7789a150bc (patch) | |
| tree | 258fc8e1e307d9e4e54741823f382246d3ca1103 | |
| parent | f7d8e3d01f46ecfa5b4bc8c13640831d97a78236 (diff) | |
| parent | d1eded46fa5ed350ff52654103623090101b3ba6 (diff) | |
| download | git-77b598b438e51d45229fe945e2139a7789a150bc.tar.gz | |
Merge branch 'maint'
* maint:
Fix typo in remote set-head usage
Makefile: hide stderr of curl-config test
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | builtin/remote.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1573,7 +1573,7 @@ else REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES) PROGRAM_OBJS += http-fetch.o PROGRAMS += $(REMOTE_CURL_NAMES) - curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p) + curl_check := $(shell (echo 070908; curl-config --vernum) 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "070908" ifndef NO_EXPAT PROGRAM_OBJS += http-push.o diff --git a/builtin/remote.c b/builtin/remote.c index a5a4b23231..937484d7c7 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -39,7 +39,7 @@ static const char * const builtin_remote_rm_usage[] = { }; static const char * const builtin_remote_sethead_usage[] = { - N_("git remote set-head <name> (-a | -d | <branch>])"), + N_("git remote set-head <name> (-a | -d | <branch>)"), NULL }; |