From: Reuven Y <robi@xxxxxxxxxxxxxx> his->this The 't' probably just failed while typing, since we refer here to a branch not a person Signed-off-by: Reuven Yagel <robi@xxxxxxxxxxxxxx> --- typo in glossary content his->this The 't' probably just failed while typing, since we refer here to a branch not a person Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-957%2Frobi-y%2Fmaster-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-957/robi-y/master-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/957 Documentation/glossary-content.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 67c7a50b96a0..e75aed00ffe1 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -146,7 +146,7 @@ current branch integrates with) obviously do not work, as there is no <<def_revision,revision>> and you are "merging" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> - <<def_commit,commit>> but instead just update to his + <<def_commit,commit>> but instead just update to this revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>. base-commit: bf949ade81106fbda068c1fdb2c6fd1cb1babe7e -- gitgitgadget