Skip to content

Commit 021a12b

Browse files
committed
Quote mentions of dot files to avoid pandoc bug
Pandoc doesn't escape lines starting with a period. At least two lines starting with `.git-ftp.log` just disappeared from the man page.
1 parent 770d57e commit 021a12b

File tree

4 files changed

+26
-13
lines changed

4 files changed

+26
-13
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Version 1.3.1
2+
=============
3+
4+
* Fixed man file to avoid pandoc bug resulting in missing content
5+
16
Version 1.3.0
27
=============
38

git-ftp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
readonly DEFAULT_PROTOCOL="ftp"
2525
readonly REMOTE_LCK_FILE="$(basename "$0").lck"
2626
readonly SYSTEM="$(uname)"
27-
readonly VERSION='1.3.0'
27+
readonly VERSION='1.3.1'
2828

2929
# ------------------------------------------------------------
3030
# Defaults

man/git-ftp.1.md

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% GIT-FTP(1) git-ftp User Manual
2-
% Rene Moser <mail@renemoser.net>
3-
% 2015-02-08
2+
%
3+
% 2016-12-03
44

55
# NAME
66

@@ -12,11 +12,11 @@ Git-ftp - Git powered FTP client written as shell script.
1212

1313
# DESCRIPTION
1414

15-
Git-ftp is a FTP client using [Git] to determine which local files to upload or
15+
Git-ftp is an FTP client using [Git] to determine which local files to upload or
1616
which files to delete on the remote host.
1717

18-
It saves the deployed state by uploading the SHA1 hash in the .git-ftp.log file.
19-
There is no need for Git to be installed on the remote host.
18+
It saves the deployed state by uploading the SHA1 hash in the `.git-ftp.log`
19+
file. There is no need for Git to be installed on the remote host.
2020

2121
Even if you play with different branches, git-ftp knows which files are
2222
different and handles only those files. That saves time and bandwidth.
@@ -25,10 +25,11 @@ different and handles only those files. That saves time and bandwidth.
2525

2626
`init`
2727
: Uploads all git-tracked non-ignored files to the remote server and
28-
creates the .git-ftp.log file containing the SHA1 of the latest commit.
28+
creates the `.git-ftp.log` file containing the SHA1 of the latest
29+
commit.
2930

3031
`catchup`
31-
: Creates or updates the .git-ftp.log file on the remote host.
32+
: Creates or updates the `.git-ftp.log` file on the remote host.
3233
It assumes that you uploaded all other files already.
3334
You might have done that with another program.
3435

@@ -41,7 +42,7 @@ different and handles only those files. That saves time and bandwidth.
4142
This feature needs lftp to be installed and does not use any power of
4243
Git.
4344
WARNING: It can delete local untracked files that are not listed in
44-
your .git-ftp-ignore file.
45+
your `.git-ftp-ignore` file.
4546

4647
`pull` (EXPERIMENTAL)
4748
: Downloads changes from the remote host into a separate commit
@@ -102,7 +103,7 @@ different and handles only those files. That saves time and bandwidth.
102103
: Enable remote locking.
103104

104105
`-D`, `--dry-run`
105-
: Does not upload or delete anything, but tries to get the .git-ftp.log
106+
: Does not upload or delete anything, but tries to get the `.git-ftp.log`
106107
file from remote host.
107108

108109
`-f`, `--force`
@@ -151,7 +152,8 @@ different and handles only those files. That saves time and bandwidth.
151152
: Stop while merging downloaded changes during the pull action.
152153

153154
`--changed-only`
154-
: During the ftp mirror operation during a pull command, consider only the files changed since the deployed commit.
155+
: During the ftp mirror operation during a pull command, consider only
156+
the files changed since the deployed commit.
155157

156158
`--no-verify`
157159
: Bypass the pre-ftp-push hook. See **HOOKS** section.
@@ -323,7 +325,7 @@ And it will not delete files from that directory if local files are deleted.
323325
# DOWNLOADING FILES (EXPERIMENTAL)
324326

325327
**WARNING:** It can delete local untracked files that are not listed in your
326-
.git-ftp-ignore file.
328+
`.git-ftp-ignore` file.
327329

328330
You can use git-ftp to download from the remote host into your repository.
329331
You will need to install the lftp command line tool for that.
@@ -496,3 +498,9 @@ At the time of this writing, the exit codes are:
496498
The upstream BTS can be found at <https://github.com/git-ftp/git-ftp/issues>.
497499

498500
[Git]: http://git-scm.org
501+
502+
# AUTHORS
503+
504+
Git-ftp was started by Rene Moser and is currently maintained by Maikel Linke.
505+
Numerous conributions have come from Github users.
506+
See the AUTHORS file for an incomplete list of contributors.

tests/git-ftp-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ test_displays_usage() {
9494

9595
test_prints_version() {
9696
version=$($GIT_FTP_CMD 2>&1 --version)
97-
assertEquals "git-ftp version 1.3.0" "$version"
97+
assertEquals "git-ftp version 1.3.1" "$version"
9898
}
9999

100100
test_inits() {

0 commit comments

Comments
 (0)