Skip to content
Snippets Groups Projects
Commit 730928e5 authored by Jean-Noël Avila's avatar Jean-Noël Avila
Browse files

Update sources after switching to po4a v0.62

parent 5bbb9d11
No related branches found
No related tags found
No related merge requests found
#!/bin/sh #!/bin/sh
git clone https://github.com/mquinson/po4a.git git clone https://github.com/mquinson/po4a.git
cd po4a && git checkout v0.56 && cd .. cd po4a && git checkout v0.62 && cd ..
...@@ -120,8 +120,8 @@ are: ...@@ -120,8 +120,8 @@ are:
The .git location may be auto-discovered, or come from `$GIT_DIR` The .git location may be auto-discovered, or come from `$GIT_DIR`
environment variable. If the repository is auto discovered via a .git environment variable. If the repository is auto discovered via a .git
file (e.g. from submodules, or a linked worktree), the .git location file (e.g. from submodules, or a linked worktree), the .git location
would be the final location where the .git directory is, not where would be the final location where the .git directory is, not where the
the .git file is. .git file is.
+ +
The pattern can contain standard globbing wildcards and two additional The pattern can contain standard globbing wildcards and two additional
ones, `**/` and `/**`, that can match multiple path components. Please ones, `**/` and `/**`, that can match multiple path components. Please
...@@ -240,15 +240,13 @@ boolean:: ...@@ -240,15 +240,13 @@ boolean::
When a variable is said to take a boolean value, many When a variable is said to take a boolean value, many
synonyms are accepted for 'true' and 'false'; these are all synonyms are accepted for 'true' and 'false'; these are all
case-insensitive. case-insensitive.
+
true;; true;; Boolean true literals are `yes`, `on`, `true`,
Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>`
and `1`. Also, a variable defined without `= <value>` is taken as true.
is taken as true.
false;; Boolean false literals are `no`, `off`, `false`,
false;; `0` and the empty string.
Boolean false literals are `no`, `off`, `false`,
`0` and the empty string.
+ +
When converting a value to its canonical form using the `--type=bool` type When converting a value to its canonical form using the `--type=bool` type
specifier, 'git config' will ensure that the output is "true" or specifier, 'git config' will ensure that the output is "true" or
......
...@@ -128,9 +128,9 @@ Submodule Rewriting ...@@ -128,9 +128,9 @@ Submodule Rewriting
--rewrite-submodules-from=<name>:<file>:: --rewrite-submodules-from=<name>:<file>::
--rewrite-submodules-to=<name>:<file>:: --rewrite-submodules-to=<name>:<file>::
Rewrite the object IDs for the submodule specified by <name> from the values Rewrite the object IDs for the submodule specified by <name> from the values
used in the from <file> to those used in the to <file>. The from marks should used in the from <file> to those used in the to <file>. The from marks should
have been created by `git fast-export`, and the to marks should have been have been created by `git fast-export`, and the to marks should have been
created by `git fast-import` when importing that same submodule. created by `git fast-import` when importing that same submodule.
+ +
<name> may be any arbitrary string not containing a colon character, but the <name> may be any arbitrary string not containing a colon character, but the
same value must be used with both options when specifying corresponding marks. same value must be used with both options when specifying corresponding marks.
...@@ -1317,7 +1317,7 @@ An example crash: ...@@ -1317,7 +1317,7 @@ An example crash:
Active Branch LRU Active Branch LRU
----------------- -----------------
active_branches = 1 cur, 5 max active_branches = 1 cur, 5 max
pos clock name pos clock name
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
...@@ -20,8 +20,9 @@ DESCRIPTION ...@@ -20,8 +20,9 @@ DESCRIPTION
This command creates an empty Git repository - basically a `.git` This command creates an empty Git repository - basically a `.git`
directory with subdirectories for `objects`, `refs/heads`, directory with subdirectories for `objects`, `refs/heads`,
`refs/tags`, and template files. An initial `HEAD` file that `refs/tags`, and template files. An initial branch without any
references the HEAD of the master branch is also created. commits will be created (see the `--initial-branch` option below
for its name).
If the `$GIT_DIR` environment variable is set then it specifies a path If the `$GIT_DIR` environment variable is set then it specifies a path
to use instead of `./.git` for the base of the repository. to use instead of `./.git` for the base of the repository.
...@@ -73,8 +74,10 @@ If this is reinitialization, the repository will be moved to the specified path. ...@@ -73,8 +74,10 @@ If this is reinitialization, the repository will be moved to the specified path.
-b <branch-name>:: -b <branch-name>::
--initial-branch=<branch-name>:: --initial-branch=<branch-name>::
Use the specified name for the initial branch in the newly created repository. Use the specified name for the initial branch in the newly created
If not specified, fall back to the default name: `master`. repository. If not specified, fall back to the default name (currently
`master`, but this is subject to change in the future; the name can be
customized via the `init.defaultBranch` configuration variable).
--shared[=(false|true|umask|group|all|world|everybody|0xxx)]:: --shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
......
...@@ -663,7 +663,7 @@ In addition, the following pairs of options are incompatible: ...@@ -663,7 +663,7 @@ In addition, the following pairs of options are incompatible:
* --fork-point and --root * --fork-point and --root
BEHAVIORAL DIFFERENCES BEHAVIORAL DIFFERENCES
----------------------- ----------------------
git rebase has two primary backends: apply and merge. (The apply git rebase has two primary backends: apply and merge. (The apply
backend used to be known as the 'am' backend, but the name led to backend used to be known as the 'am' backend, but the name led to
......
...@@ -57,8 +57,8 @@ OPTIONS ...@@ -57,8 +57,8 @@ OPTIONS
updates are needed by checking stat() information. updates are needed by checking stat() information.
-q:: -q::
Quiet. If --refresh finds that the index needs an update, the Quiet. If --refresh finds that the index needs an update, the
default behavior is to error out. This option makes default behavior is to error out. This option makes
'git update-index' continue anyway. 'git update-index' continue anyway.
--ignore-submodules:: --ignore-submodules::
...@@ -66,9 +66,9 @@ OPTIONS ...@@ -66,9 +66,9 @@ OPTIONS
when passed before --refresh. when passed before --refresh.
--unmerged:: --unmerged::
If --refresh finds unmerged changes in the index, the default If --refresh finds unmerged changes in the index, the default
behavior is to error out. This option makes 'git update-index' behavior is to error out. This option makes 'git update-index'
continue anyway. continue anyway.
--ignore-missing:: --ignore-missing::
Ignores missing files during a --refresh Ignores missing files during a --refresh
...@@ -81,10 +81,10 @@ OPTIONS ...@@ -81,10 +81,10 @@ OPTIONS
encouraged to use a single-parameter form. encouraged to use a single-parameter form.
--index-info:: --index-info::
Read index information from stdin. Read index information from stdin.
--chmod=(+|-)x:: --chmod=(+|-)x::
Set the execute permissions on the updated files. Set the execute permissions on the updated files.
--[no-]assume-unchanged:: --[no-]assume-unchanged::
When this flag is specified, the object names recorded When this flag is specified, the object names recorded
...@@ -157,7 +157,7 @@ you will need to handle the situation manually. ...@@ -157,7 +157,7 @@ you will need to handle the situation manually.
separated by LF (i.e. one path per line) by default. separated by LF (i.e. one path per line) by default.
--verbose:: --verbose::
Report what is being added and removed from index. Report what is being added and removed from index.
--index-version <n>:: --index-version <n>::
Write the resulting index out in the named on-disk format version. Write the resulting index out in the named on-disk format version.
......
This diff is collapsed.
...@@ -106,7 +106,6 @@ git-p4.txt ...@@ -106,7 +106,6 @@ git-p4.txt
git-pack-objects.txt git-pack-objects.txt
git-pack-redundant.txt git-pack-redundant.txt
git-pack-refs.txt git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt git-patch-id.txt
git-prune-packed.txt git-prune-packed.txt
git-prune.txt git-prune.txt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment