diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:07:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:07:49 -0800 |
| commit | c34ba9967c0cf882bbdaf87bd72fa84e0ef099ed (patch) | |
| tree | 2430bc763807d3814a84982facfee80608c75022 | |
| parent | 1e501a7c47ad5ada53d3b1acfb9f131f76e969ec (diff) | |
| parent | c2857fb8b7903b2bba9217310971e5282549174d (diff) | |
| download | git-c34ba9967c0cf882bbdaf87bd72fa84e0ef099ed.tar.gz | |
Merge branch 'maint-1.7.6' into maint-1.7.7
* maint-1.7.6:
stripspace: fix outdated comment
Add MYMETA.yml to perl/.gitignore
| -rw-r--r-- | builtin/stripspace.c | 2 | ||||
| -rw-r--r-- | perl/.gitignore | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/builtin/stripspace.c b/builtin/stripspace.c index 4d3b93fedb..1288ffcc52 100644 --- a/builtin/stripspace.c +++ b/builtin/stripspace.c @@ -22,8 +22,6 @@ static size_t cleanup(char *line, size_t len) * Remove empty lines from the beginning and end * and also trailing spaces from every line. * - * Note that the buffer will not be NUL-terminated. - * * Turn multiple consecutive empty lines between paragraphs * into just one empty line. * diff --git a/perl/.gitignore b/perl/.gitignore index 98b24772c7..9235e73163 100644 --- a/perl/.gitignore +++ b/perl/.gitignore @@ -1,5 +1,6 @@ perl.mak perl.mak.old +MYMETA.yml blib blibdirs pm_to_blib |