From 77e55640d76c4ce69f54c5f94710f54f2e866d2c Mon Sep 17 00:00:00 2001 From: Angel Aguilera Date: Mon, 14 Nov 2016 11:17:28 +0100 Subject: [PATCH] fix: git-squash docs. Replaced 'actual' with 'current' --- man/git-squash.1 | 2 +- man/git-squash.html | 2 +- man/git-squash.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/git-squash.1 b/man/git-squash.1 index 12151c3..220bf33 100644 --- a/man/git-squash.1 +++ b/man/git-squash.1 @@ -16,7 +16,7 @@ Produce the working tree and index state as if a real merge happened without the . .P -Branch to squash on the actual branch\. +Branch to squash on the current branch\. . .P A commit reference (has to be from the current branch) can also be used as the first argument\. A range of commits \fIsha\fR\.\.HEAD will be squashed\. diff --git a/man/git-squash.html b/man/git-squash.html index 6396067..a0d4e6d 100644 --- a/man/git-squash.html +++ b/man/git-squash.html @@ -87,7 +87,7 @@

<source-branch>

-

Branch to squash on the actual branch.

+

Branch to squash on the current branch.

<commit reference> A commit reference (has to be from the current branch) can also be used as the diff --git a/man/git-squash.md b/man/git-squash.md index 3dd588d..baa4bcf 100644 --- a/man/git-squash.md +++ b/man/git-squash.md @@ -14,7 +14,7 @@ git-squash(1) -- Import changes from a branch <source-branch> - Branch to squash on the actual branch. + Branch to squash on the current branch. <commit reference> A commit reference (has to be from the current branch) can also be used as the