diff options
Diffstat (limited to 'man1/git-pull.1')
| -rw-r--r-- | man1/git-pull.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man1/git-pull.1 b/man1/git-pull.1 index d3b4081c9..988c97816 100644 --- a/man1/git-pull.1 +++ b/man1/git-pull.1 @@ -2,12 +2,12 @@ .\" Title: git-pull .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-12-20 +.\" Date: 2023-12-27 .\" Manual: Git Manual -.\" Source: Git 2.43.0.174.g055bb6e996 +.\" Source: Git 2.43.0.232.ge79552d197 .\" Language: English .\" -.TH "GIT\-PULL" "1" "2023\-12\-20" "Git 2\&.43\&.0\&.174\&.g055bb6" "Git Manual" +.TH "GIT\-PULL" "1" "2023\-12\-27" "Git 2\&.43\&.0\&.232\&.ge79552" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -256,7 +256,7 @@ Synonyms to \-\-stat and \-\-no\-stat; these are deprecated and will be removed .PP \-\-autostash, \-\-no\-autostash .RS 4 -Automatically create a temporary stash entry before the operation begins, record it in the special ref +Automatically create a temporary stash entry before the operation begins, record it in the ref \fBMERGE_AUTOSTASH\fR and apply it after the operation ends\&. This means that you can run the operation on a dirty worktree\&. However, use with care: the final stash application after a successful merge might result in non\-trivial conflicts\&. .RE |