diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-20 16:51:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-20 16:51:05 -0700 |
| commit | 7a6a5e406297792075ca20a63427dd37ee4ecb01 (patch) | |
| tree | a00ae9e8db4de87e652ebb9c11a7970dd687af40 | |
| parent | e19343ad547e32aaf511b0b38be083e1b3145d4e (diff) | |
| parent | 0b92f1a9d213644d2cd6c1870091c090a6b7eca9 (diff) | |
| download | git-7a6a5e406297792075ca20a63427dd37ee4ecb01.tar.gz git-7a6a5e406297792075ca20a63427dd37ee4ecb01.tar.xz | |
Merge branch 'maint'
* maint:
Fix typo in show-index.c
pager: default to LESS=FRS
| -rw-r--r-- | pager.c | 2 | ||||
| -rw-r--r-- | show-index.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -50,7 +50,7 @@ void setup_pager(void) close(fd[0]); close(fd[1]); - setenv("LESS", "-RS", 0); + setenv("LESS", "FRS", 0); run_pager(pager); die("unable to execute pager '%s'", pager); exit(255); diff --git a/show-index.c b/show-index.c index c21d660b6..a30a2de5d 100644 --- a/show-index.c +++ b/show-index.c @@ -8,7 +8,7 @@ int main(int argc, char **argv) static unsigned int top_index[256]; if (fread(top_index, sizeof(top_index), 1, stdin) != 1) - die("unable to read idex"); + die("unable to read index"); nr = 0; for (i = 0; i < 256; i++) { unsigned n = ntohl(top_index[i]); |