From 19e119eec19706dee60f143d8c607ead73bff39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Thu, 24 Nov 2022 19:43:23 +0100 Subject: [PATCH] update to v2.39.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila --- GIT-VERSION-FILE | 2 +- en/config.txt | 4 + en/git-annotate.txt | 2 +- en/git-clean.txt | 10 +- en/git-credential-cache--daemon.txt | 4 +- en/git-credential-cache.txt | 4 +- en/git-credential.txt | 2 + en/git-diff-files.txt | 2 +- en/git-diff.txt | 8 +- en/git-fast-export.txt | 2 +- en/git-fsck.txt | 12 + en/git-hash-object.txt | 3 +- en/git-interpret-trailers.txt | 5 +- en/git-ls-files.txt | 4 +- en/git-merge-base.txt | 4 +- en/git-merge-tree.txt | 76 +- en/git-mv.txt | 4 +- en/git-pack-redundant.txt | 4 +- en/git-patch-id.txt | 24 +- en/git-prune-packed.txt | 2 +- en/git-push.txt | 6 +- en/git-read-tree.txt | 2 +- en/git-rebase.txt | 32 +- en/git-receive-pack.txt | 4 +- en/git-reflog.txt | 17 +- en/git-repack.txt | 6 + en/git-rerere.txt | 2 +- en/git-rev-list.txt | 2 +- en/git-rev-parse.txt | 7 + en/git-revert.txt | 2 +- en/git-send-email.txt | 15 +- en/git-send-pack.txt | 5 +- en/git-shortlog.txt | 8 + en/git-show-branch.txt | 4 +- en/git-show-ref.txt | 4 +- en/git-stash.txt | 17 +- en/git-status.txt | 2 +- en/git-symbolic-ref.txt | 11 +- en/git-tag.txt | 18 +- en/git-update-server-info.txt | 8 +- en/git-upload-archive.txt | 4 +- en/git-var.txt | 2 +- en/git-verify-commit.txt | 2 +- en/git-verify-pack.txt | 2 +- en/git-verify-tag.txt | 2 +- en/git-worktree.txt | 3 +- en/git.txt | 45 +- en/glossary-content.txt | 27 +- en/rerere-options.txt | 9 + en/rev-list-options.txt | 7 + en/revisions.txt | 2 +- po/documentation.de.po | 8399 +++++++------------ po/documentation.es.po | 5965 +++++++------- po/documentation.es_MX.po | 8550 +++++++++---------- po/documentation.fr.po | 6045 ++++++-------- po/documentation.hu.po | 11214 ++++++++++++------------- po/documentation.id.po | 7149 ++++++++-------- po/documentation.is.po | 5883 +++++++------ po/documentation.it.po | 10527 ++++++++++++------------ po/documentation.ja.po | 7480 ++++++++--------- po/documentation.ko.po | 7118 ++++++++-------- po/documentation.mr.po | 7820 +++++++++--------- po/documentation.nb_NO.po | 11442 +++++++++++++------------- po/documentation.nl.po | 6137 +++++++------- po/documentation.pl.po | 7251 ++++++++-------- po/documentation.pt_BR.po | 9474 ++++++++++----------- po/documentation.pt_PT.po | 11436 ++++++++++++------------- po/documentation.ro.po | 9950 +++++++++++----------- po/documentation.ru.po | 5949 +++++++------ po/documentation.sk.po | 7564 ++++++++--------- po/documentation.tr.po | 10970 ++++++++++++------------ po/documentation.uk.po | 10618 ++++++++++++------------ po/documentation.vi.po | 6993 ++++++++-------- po/documentation.zh_HANS-CN.po | 5270 ++++++------ po/documentation.zh_HANT.po | 11284 ++++++++++++------------- sources.txt | 3 + 76 files changed, 97641 insertions(+), 103305 deletions(-) create mode 100644 en/rerere-options.txt diff --git a/GIT-VERSION-FILE b/GIT-VERSION-FILE index 25c68026..8cf3c60f 100644 --- a/GIT-VERSION-FILE +++ b/GIT-VERSION-FILE @@ -1 +1 @@ -GIT_VERSION = 2.38.0 +GIT_VERSION = 2.39.0 diff --git a/en/config.txt b/en/config.txt index 5b5b9765..0e93aef8 100644 --- a/en/config.txt +++ b/en/config.txt @@ -387,6 +387,8 @@ include::config/branch.txt[] include::config/browser.txt[] +include::config/bundle.txt[] + include::config/checkout.txt[] include::config/clean.txt[] @@ -423,6 +425,8 @@ include::config/filter.txt[] include::config/fsck.txt[] +include::config/fsmonitor--daemon.txt[] + include::config/gc.txt[] include::config/gitcvs.txt[] diff --git a/en/git-annotate.txt b/en/git-annotate.txt index e44a8313..5ae8aabe 100644 --- a/en/git-annotate.txt +++ b/en/git-annotate.txt @@ -8,7 +8,7 @@ git-annotate - Annotate file lines with commit information SYNOPSIS -------- [verse] -'git annotate' [] [] +'git annotate' [] [] [] [--] DESCRIPTION ----------- diff --git a/en/git-clean.txt b/en/git-clean.txt index 91742633..160d08b8 100644 --- a/en/git-clean.txt +++ b/en/git-clean.txt @@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree SYNOPSIS -------- [verse] -'git clean' [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ... +'git clean' [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] [...] DESCRIPTION ----------- @@ -20,16 +20,16 @@ Normally, only files unknown to Git are removed, but if the `-x` option is specified, ignored files are also removed. This can, for example, be useful to remove all build products. -If any optional `...` arguments are given, only those paths -are affected. +If any optional `...` arguments are given, only those paths +that match the pathspec are affected. OPTIONS ------- -d:: - Normally, when no is specified, git clean will not + Normally, when no is specified, git clean will not recurse into untracked directories to avoid removing too much. Specify -d to have it recurse into such directories as well. - If any paths are specified, -d is irrelevant; all untracked + If a is specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed. diff --git a/en/git-credential-cache--daemon.txt b/en/git-credential-cache--daemon.txt index 01e1c214..650a15a7 100644 --- a/en/git-credential-cache--daemon.txt +++ b/en/git-credential-cache--daemon.txt @@ -8,7 +8,7 @@ git-credential-cache--daemon - Temporarily store user credentials in memory SYNOPSIS -------- [verse] -'git credential-cache{litdd}daemon' [--debug] +'git credential-cache{litdd}daemon' [--debug] DESCRIPTION ----------- @@ -16,7 +16,7 @@ DESCRIPTION NOTE: You probably don't want to invoke this command yourself; it is started automatically when you use linkgit:git-credential-cache[1]. -This command listens on the Unix domain socket specified by `` +This command listens on the Unix domain socket specified by `` for `git-credential-cache` clients. Clients may store and retrieve credentials. Each credential is held for a timeout specified by the client; once no credentials are held, the daemon exits. diff --git a/en/git-credential-cache.txt b/en/git-credential-cache.txt index 0216c18e..432e159d 100644 --- a/en/git-credential-cache.txt +++ b/en/git-credential-cache.txt @@ -69,10 +69,10 @@ $ git push http://example.com/repo.git ------------------------------------ You can provide options via the credential.helper configuration -variable (this example drops the cache time to 5 minutes): +variable (this example increases the cache time to 1 hour): ------------------------------------------------------- -$ git config credential.helper 'cache --timeout=300' +$ git config credential.helper 'cache --timeout=3600' ------------------------------------------------------- GIT diff --git a/en/git-credential.txt b/en/git-credential.txt index f1867301..ac2818b9 100644 --- a/en/git-credential.txt +++ b/en/git-credential.txt @@ -160,6 +160,8 @@ empty string. Components which are missing from the URL (e.g., there is no username in the example above) will be left unset. +Unrecognised attributes are silently discarded. + GIT --- Part of the linkgit:git[1] suite diff --git a/en/git-diff-files.txt b/en/git-diff-files.txt index bf1febb9..591e3801 100644 --- a/en/git-diff-files.txt +++ b/en/git-diff-files.txt @@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the index SYNOPSIS -------- [verse] -'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [] [...] +'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [] [...] DESCRIPTION ----------- diff --git a/en/git-diff.txt b/en/git-diff.txt index 85ae6d6d..52b67925 100644 --- a/en/git-diff.txt +++ b/en/git-diff.txt @@ -79,10 +79,10 @@ If --merge-base is given, use the merge base of the two commits for the This form is to view the results of a merge commit. The first listed must be the merge itself; the remaining two or - more commits should be its parents. A convenient way to produce - the desired set of revisions is to use the `^@` suffix. - For instance, if `master` names a merge commit, `git diff master - master^@` gives the same combined diff as `git show master`. + more commits should be its parents. Convenient ways to produce + the desired set of revisions are to use the suffixes `^@` and + `^!`. If A is a merge commit, then `git diff A A^@`, + `git diff A^!` and `git show A` all give the same combined diff. 'git diff' [] .. [--] [...]:: diff --git a/en/git-fast-export.txt b/en/git-fast-export.txt index 1978dbdc..4643ddbe 100644 --- a/en/git-fast-export.txt +++ b/en/git-fast-export.txt @@ -9,7 +9,7 @@ git-fast-export - Git data exporter SYNOPSIS -------- [verse] -'git fast-export []' | 'git fast-import' +'git fast-export' [] | 'git fast-import' DESCRIPTION ----------- diff --git a/en/git-fsck.txt b/en/git-fsck.txt index 29318ea9..b6a0f8a0 100644 --- a/en/git-fsck.txt +++ b/en/git-fsck.txt @@ -152,6 +152,18 @@ hash mismatch :: object database value. This indicates a serious data integrity problem. + +FSCK MESSAGES +------------- + +The following lists the types of errors `git fsck` detects and what +each error means, with their default severity. The severity of the +error, other than those that are marked as "(FATAL)", can be tweaked +by setting the corresponding `fsck.` configuration variable. + +include::fsck-msgids.txt[] + + Environment Variables --------------------- diff --git a/en/git-hash-object.txt b/en/git-hash-object.txt index df9e2c58..472b5bb9 100644 --- a/en/git-hash-object.txt +++ b/en/git-hash-object.txt @@ -9,7 +9,8 @@ git-hash-object - Compute object ID and optionally creates a blob from a file SYNOPSIS -------- [verse] -'git hash-object' [-t ] [-w] [--path=|--no-filters] [--stdin [--literally]] [--] ... +'git hash-object' [-t ] [-w] [--path= | --no-filters] + [--stdin [--literally]] [--] ... 'git hash-object' [-t ] [-w] --stdin-paths [--no-filters] DESCRIPTION diff --git a/en/git-interpret-trailers.txt b/en/git-interpret-trailers.txt index 6d6197cd..22ff3a60 100644 --- a/en/git-interpret-trailers.txt +++ b/en/git-interpret-trailers.txt @@ -8,8 +8,9 @@ git-interpret-trailers - Add or parse structured information in commit messages SYNOPSIS -------- [verse] -'git interpret-trailers' [] [(--trailer [(=|:)])...] [...] -'git interpret-trailers' [] [--parse] [...] +'git interpret-trailers' [--in-place] [--trim-empty] + [(--trailer [(=|:)])...] + [--parse] [...] DESCRIPTION ----------- diff --git a/en/git-ls-files.txt b/en/git-ls-files.txt index d7986419..440043cd 100644 --- a/en/git-ls-files.txt +++ b/en/git-ls-files.txt @@ -10,8 +10,8 @@ SYNOPSIS -------- [verse] 'git ls-files' [-z] [-t] [-v] [-f] - [-c|--cached] [-d|--deleted] [-o|--others] [-i|--|ignored] - [-s|--stage] [-u|--unmerged] [-k|--|killed] [-m|--modified] + [-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored] + [-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified] [--directory [--no-empty-directory]] [--eol] [--deduplicate] [-x |--exclude=] diff --git a/en/git-merge-base.txt b/en/git-merge-base.txt index 2d944e08..b01ba3d3 100644 --- a/en/git-merge-base.txt +++ b/en/git-merge-base.txt @@ -9,8 +9,8 @@ git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS -------- [verse] -'git merge-base' [-a|--all] ... -'git merge-base' [-a|--all] --octopus ... +'git merge-base' [-a | --all] ... +'git merge-base' [-a | --all] --octopus ... 'git merge-base' --is-ancestor 'git merge-base' --independent ... 'git merge-base' --fork-point [] diff --git a/en/git-merge-tree.txt b/en/git-merge-tree.txt index d6c35674..04bcc416 100644 --- a/en/git-merge-tree.txt +++ b/en/git-merge-tree.txt @@ -81,6 +81,31 @@ Whereas for a conflicted merge, the output is by default of the form: These are discussed individually below. +However, there is an exception. If `--stdin` is passed, then there is +an extra section at the beginning, a NUL character at the end, and then +all the sections repeat for each line of input. Thus, if the first merge +is conflicted and the second is clean, the output would be of the form: + + + + + + NUL + + + NUL + +[[MS]] +Merge status +~~~~~~~~~~~~ + +This is an integer status followed by a NUL character. The integer status is: + + 0: merge had conflicts + 1: merge was clean + <0: something prevented the merge from running (e.g. access to repository + objects denied by filesystem) + [[OIDTLT]] OID of toplevel tree ~~~~~~~~~~~~~~~~~~~~ @@ -108,18 +133,50 @@ character instead of a newline character. Informational messages ~~~~~~~~~~~~~~~~~~~~~~ -This always starts with a blank line (or NUL if `-z` is passed) to -separate it from the previous sections, and then has free-form -messages about the merge, such as: +This section provides informational messages, typically about +conflicts. The format of the section varies significantly depending +on whether `-z` is passed. + +If `-z` is passed: + +The output format is zero or more conflict informational records, each +of the form: + + NULNUL + +where is of the form + + NULNULNUL...NUL + +and includes paths (or branch names) affected by the conflict or +informational message in . Also, is a +stable string explaining the type of conflict, such as + + * "Auto-merging" + * "CONFLICT (rename/delete)" + * "CONFLICT (submodule lacks merge base)" + * "CONFLICT (binary)" + +and is a more detailed message about the conflict which often +(but not always) embeds the within it. These +strings may change in future Git versions. Some examples: * "Auto-merging " * "CONFLICT (rename/delete): renamed...but deleted in..." - * "Failed to merge submodule ()" + * "Failed to merge submodule (no merge base)" * "Warning: cannot merge binary files: " -Note that these free-form messages will never have a NUL character -in or between them, even if -z is passed. It is simply a large block -of text taking up the remainder of the output. +If `-z` is NOT passed: + +This section starts with a blank line to separate it from the previous +sections, and then only contains the information +from the previous section (separated by newlines). These are +non-stable strings that should not be parsed by scripts, and are just +meant for human consumption. Also, note that while +strings usually do not contain embedded newlines, they sometimes do. +(However, the free-form messages will never have an embedded NUL +character). So, the entire block of information is meant for human +readers as an agglomeration of all conflict messages. EXIT STATUS ----------- @@ -127,7 +184,10 @@ EXIT STATUS For a successful, non-conflicted merge, the exit status is 0. When the merge has conflicts, the exit status is 1. If the merge is not able to complete (or start) due to some kind of error, the exit status is -something other than 0 or 1 (and the output is unspecified). +something other than 0 or 1 (and the output is unspecified). When +--stdin is passed, the return status is 0 for both successful and +conflicted merges, and something other than 0 or 1 if it cannot complete +all the requested merges. USAGE NOTES ----------- diff --git a/en/git-mv.txt b/en/git-mv.txt index 79449bf9..fb0220fd 100644 --- a/en/git-mv.txt +++ b/en/git-mv.txt @@ -9,7 +9,7 @@ git-mv - Move or rename a file, a directory, or a symlink SYNOPSIS -------- [verse] -'git mv' ... ... +'git mv' [] ... DESCRIPTION ----------- @@ -30,7 +30,7 @@ OPTIONS ------- -f:: --force:: - Force renaming or moving of a file even if the target exists + Force renaming or moving of a file even if the exists. -k:: Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor diff --git a/en/git-pack-redundant.txt b/en/git-pack-redundant.txt index ee7034b5..99ef1383 100644 --- a/en/git-pack-redundant.txt +++ b/en/git-pack-redundant.txt @@ -9,7 +9,7 @@ git-pack-redundant - Find redundant pack files SYNOPSIS -------- [verse] -'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | ... ) +'git pack-redundant' [--verbose] [--alt-odb] (--all | ...) DESCRIPTION ----------- @@ -34,7 +34,7 @@ OPTIONS --alt-odb:: Don't require objects present in packs from alternate object - directories to be present in local packs. + database (odb) directories to be present in local packs. --verbose:: Outputs some statistics to stderr. Has a small performance penalty. diff --git a/en/git-patch-id.txt b/en/git-patch-id.txt index 442caff8..1d15fa45 100644 --- a/en/git-patch-id.txt +++ b/en/git-patch-id.txt @@ -8,18 +8,18 @@ git-patch-id - Compute unique ID for a patch SYNOPSIS -------- [verse] -'git patch-id' [--stable | --unstable] +'git patch-id' [--stable | --unstable | --verbatim] DESCRIPTION ----------- Read a patch from the standard input and compute the patch ID for it. A "patch ID" is nothing but a sum of SHA-1 of the file diffs associated with a -patch, with whitespace and line numbers ignored. As such, it's "reasonably -stable", but at the same time also reasonably unique, i.e., two patches that -have the same "patch ID" are almost guaranteed to be the same thing. +patch, with line numbers ignored. As such, it's "reasonably stable", but at +the same time also reasonably unique, i.e., two patches that have the same +"patch ID" are almost guaranteed to be the same thing. -IOW, you can use this thing to look for likely duplicate commits. +The main usecase for this command is to look for likely duplicate commits. When dealing with 'git diff-tree' output, it takes advantage of the fact that the patch is prefixed with the object name of the @@ -30,6 +30,12 @@ This can be used to make a mapping from patch ID to commit ID. OPTIONS ------- +--verbatim:: + Calculate the patch-id of the input as it is given, do not strip + any whitespace. + + This is the default if patchid.verbatim is true. + --stable:: Use a "stable" sum of hashes as the patch ID. With this option: - Reordering file diffs that make up a patch does not affect the ID. @@ -45,14 +51,16 @@ OPTIONS of "-O", thereby making existing databases storing such "unstable" or historical patch-ids unusable. + - All whitespace within the patch is ignored and does not affect the id. + This is the default if patchid.stable is set to true. --unstable:: Use an "unstable" hash as the patch ID. With this option, the result produced is compatible with the patch-id value produced - by git 1.9 and older. Users with pre-existing databases storing - patch-ids produced by git 1.9 and older (who do not deal with reordered - patches) may want to use this option. + by git 1.9 and older and whitespace is ignored. Users with pre-existing + databases storing patch-ids produced by git 1.9 and older (who do not deal + with reordered patches) may want to use this option. This is the default. diff --git a/en/git-prune-packed.txt b/en/git-prune-packed.txt index 9fed59a3..844d6f80 100644 --- a/en/git-prune-packed.txt +++ b/en/git-prune-packed.txt @@ -9,7 +9,7 @@ git-prune-packed - Remove extra objects that are already in pack files SYNOPSIS -------- [verse] -'git prune-packed' [-n|--dry-run] [-q|--quiet] +'git prune-packed' [-n | --dry-run] [-q | --quiet] DESCRIPTION diff --git a/en/git-push.txt b/en/git-push.txt index def7657e..5bb1d5aa 100644 --- a/en/git-push.txt +++ b/en/git-push.txt @@ -409,10 +409,14 @@ Specifying `--no-force-if-includes` disables this behavior. all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If 'only' is used all - submodules will be recursively pushed while the superproject is left + submodules will be pushed while the superproject is left unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required. ++ +When using 'on-demand' or 'only', if a submodule has a +"push.recurseSubmodules={on-demand,only}" or "submodule.recurse" configuration, +further recursion will occur. In this case, "only" is treated as "on-demand". --[no-]verify:: Toggle the pre-push hook (see linkgit:githooks[5]). The diff --git a/en/git-read-tree.txt b/en/git-read-tree.txt index b9bfdc0a..7567955b 100644 --- a/en/git-read-tree.txt +++ b/en/git-read-tree.txt @@ -9,7 +9,7 @@ git-read-tree - Reads tree information into the index SYNOPSIS -------- [verse] -'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=] +'git read-tree' [(-m [--trivial] [--aggressive] | --reset | --prefix=) [-u | -i]] [--index-output=] [--no-sparse-checkout] (--empty | [ []]) diff --git a/en/git-rebase.txt b/en/git-rebase.txt index 9cb8931c..f9675bd2 100644 --- a/en/git-rebase.txt +++ b/en/git-rebase.txt @@ -218,12 +218,14 @@ leave out at most one of A and B, in which case it defaults to HEAD. merge base of `` and ``. Running `git rebase --keep-base ` is equivalent to running - `git rebase --onto ... `. + `git rebase --reapply-cherry-picks --no-fork-point --onto ... `. + This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep -rebasing on top of the upstream but to keep the base commit as-is. +rebasing on top of the upstream but to keep the base commit as-is. As +the base commit is unchanged this option implies `--reapply-cherry-picks` +to avoid losing commits. + Although both this option and `--fork-point` find the merge base between `` and ``, this option uses the merge base as the _starting @@ -278,7 +280,8 @@ See also INCOMPATIBLE OPTIONS below. Note that commits which start empty are kept (unless `--no-keep-empty` is specified), and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are detected and dropped as a -preliminary step (unless `--reapply-cherry-picks` is passed). +preliminary step (unless `--reapply-cherry-picks` or `--keep-base` is +passed). + See also INCOMPATIBLE OPTIONS below. @@ -311,13 +314,16 @@ See also INCOMPATIBLE OPTIONS below. upstream changes, the behavior towards them is controlled by the `--empty` flag.) + -By default (or if `--no-reapply-cherry-picks` is given), these commits -will be automatically dropped. Because this necessitates reading all -upstream commits, this can be expensive in repos with a large number -of upstream commits that need to be read. When using the 'merge' -backend, warnings will be issued for each dropped commit (unless -`--quiet` is given). Advice will also be issued unless -`advice.skippedCherryPicks` is set to false (see linkgit:git-config[1]). + +In the absence of `--keep-base` (or if `--no-reapply-cherry-picks` is +given), these commits will be automatically dropped. Because this +necessitates reading all upstream commits, this can be expensive in +repositories with a large number of upstream commits that need to be +read. When using the 'merge' backend, warnings will be issued for each +dropped commit (unless `--quiet` is given). Advice will also be issued +unless `advice.skippedCherryPicks` is set to false (see +linkgit:git-config[1]). + + `--reapply-cherry-picks` allows rebase to forgo reading all upstream commits, potentially improving performance. @@ -443,9 +449,9 @@ When `--fork-point` is active, 'fork_point' will be used instead of ` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the `` will be used as a fallback. + -If `` is given on the command line, then the default is -`--no-fork-point`, otherwise the default is `--fork-point`. See also -`rebase.forkpoint` in linkgit:git-config[1]. +If `` or `--keep-base` is given on the command line, then +the default is `--no-fork-point`, otherwise the default is +`--fork-point`. See also `rebase.forkpoint` in linkgit:git-config[1]. + If your branch was based on `` but `` was rewound and your branch contains commits which were dropped, this option can be used diff --git a/en/git-receive-pack.txt b/en/git-receive-pack.txt index 014a7840..65ff518c 100644 --- a/en/git-receive-pack.txt +++ b/en/git-receive-pack.txt @@ -9,7 +9,7 @@ git-receive-pack - Receive what is pushed into the repository SYNOPSIS -------- [verse] -'git-receive-pack' +'git receive-pack' DESCRIPTION ----------- @@ -38,7 +38,7 @@ its behavior, see linkgit:git-config[1]. OPTIONS ------- -:: +:: The repository to sync into. --http-backend-info-refs:: diff --git a/en/git-reflog.txt b/en/git-reflog.txt index db9d46ed..ec64cbff 100644 --- a/en/git-reflog.txt +++ b/en/git-reflog.txt @@ -9,15 +9,7 @@ git-reflog - Manage reflog information SYNOPSIS -------- [verse] -'git reflog' - -DESCRIPTION ------------ -The command takes various subcommands, and different options -depending on the subcommand: - -[verse] -'git reflog' ['show'] [] [] +'git reflog' [show] [] [] 'git reflog expire' [--expire=