diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:08:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 15:08:20 -0800 |
| commit | 9a6e2d77e91af34ebc6679ba3250524504083284 (patch) | |
| tree | 25dc9642dba21131b9dd6f325e6f926458565375 | |
| parent | git-p4: introduce skipSubmitEdit (diff) | |
| parent | Merge branch 'maint-1.7.7' into maint (diff) | |
| download | tgif-9a6e2d77e91af34ebc6679ba3250524504083284.tar.xz | |
Merge branch 'maint'
* maint:
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 |