0adda9362a · matheusbsbs/matheus-bagliano

Documentation/git-am.txt

+2 -2

@@ -14,7 +14,7 @@ SYNOPSIS

14 [--ignore-date] [--ignore-space-change | --ignore-whitespace]

15 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]

16 [--reject] [-q | --quiet] [--scissors | --no-scissors]

17 - [<mbox> | <Maildir>...]

17 + [(<mbox> | <Maildir>)...]

18 'git am' (--continue | --skip | --abort)

19

20 DESCRIPTION

@@ -25,7 +25,7 @@ current branch.

25

26 OPTIONS

27 -------

28 -<mbox>|<Maildir>...::

28 +(<mbox>|<Maildir>)...::

29 The list of mailbox files to read patches from. If you do not

30 supply this argument, the command reads from the standard input.

31 If you supply directories, they will be treated as Maildirs.

Documentation/git-apply.txt

+1 -1

@@ -14,7 +14,7 @@ SYNOPSIS

14 [--allow-binary-replacement | --binary] [--reject] [-z]

15 [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]

16 [--ignore-space-change | --ignore-whitespace ]

17 - [--whitespace=<nowarn|warn|fix|error|error-all>]

17 + [--whitespace=(nowarn|warn|fix|error|error-all)]

18 [--exclude=<path>] [--include=<path>] [--directory=<root>]

19 [--verbose] [<patch>...]

20

Documentation/git-checkout-index.txt

+1 -1

@@ -13,7 +13,7 @@ SYNOPSIS

13 [--stage=<number>|all]

14 [--temp]

15 [-z] [--stdin]

16 - [--] [<file>]*

16 + [--] [<file>...]

17

18 DESCRIPTION

19 -----------

Documentation/git-commit-tree.txt

+1 -1

@@ -8,7 +8,7 @@ git-commit-tree - Create a new commit object

8

9 SYNOPSIS

10 --------

11 -'git commit-tree' <tree> [-p <parent commit>]* < changelog

11 +'git commit-tree' <tree> [(-p <parent commit>)...] < changelog

12

13 DESCRIPTION

14 -----------

Documentation/git-fetch.txt

+1 -1

@@ -12,7 +12,7 @@ SYNOPSIS

12

13 'git fetch' [<options>] <group>

14

15 -'git fetch' --multiple [<options>] [<repository> | <group>]...

15 +'git fetch' --multiple [<options>] [(<repository> | <group>)...]

16

17 'git fetch' --all [<options>]

18

Documentation/git-filter-branch.txt

+1 -1

@@ -117,7 +117,7 @@ OPTIONS

117 This is the filter for performing the commit.

118 If this filter is specified, it will be called instead of the

119 'git commit-tree' command, with arguments of the form

120 - "<TREE_ID> [-p <PARENT_COMMIT_ID>]..." and the log message on

120 + "<TREE_ID> [(-p <PARENT_COMMIT_ID>)...]" and the log message on

121 stdin. The commit id is expected on stdout.

122 +

123 As a special extension, the commit filter may emit multiple

Documentation/git-for-each-ref.txt

+1 -1

@@ -9,7 +9,7 @@ SYNOPSIS

9 --------

10 [verse]

11 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]

12 - [--sort=<key>]* [--format=<format>] [<pattern>...]

12 + [(--sort=<key>)...] [--format=<format>] [<pattern>...]

13

14 DESCRIPTION

15 -----------

Documentation/git-init.txt

+1 -1

@@ -31,7 +31,7 @@ current working directory.

31 Specify the directory from which templates will be used. (See the "TEMPLATE

32 DIRECTORY" section below.)

33

34 ---shared[={false|true|umask|group|all|world|everybody|0xxx}]::

35

36 Specify that the git repository is to be shared amongst several users. This

37 allows users belonging to the same group to push into that

Documentation/git-ls-files.txt

+1 -1

@@ -17,7 +17,7 @@ SYNOPSIS

17 [--exclude-per-directory=<file>]

18 [--exclude-standard]

19 [--error-unmatch] [--with-tree=<tree-ish>]

20 - [--full-name] [--abbrev] [--] [<file>]*

20 + [--full-name] [--abbrev] [--] [<file>...]

21

22 DESCRIPTION

23 -----------

Documentation/git-mailsplit.txt

+1 -1

@@ -7,7 +7,7 @@ git-mailsplit - Simple UNIX mbox splitter program

7

8 SYNOPSIS

9 --------

10 -'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] -o<directory> [--] [<mbox>|<Maildir>...]

10 +'git mailsplit' [-b] [-f<nn>] [-d<prec>] [--keep-cr] -o<directory> [--] [(<mbox>|<Maildir>)...]

11

12 DESCRIPTION

13 -----------

Documentation/git-mergetool.txt

+1 -1

@@ -7,7 +7,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts

7

8 SYNOPSIS

9 --------

10 -'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]...

10 +'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...]

11

12 DESCRIPTION

13 -----------

Documentation/git-pack-objects.txt

+1 -1

@@ -12,7 +12,7 @@ SYNOPSIS

12 'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]

13 [--no-reuse-delta] [--delta-base-offset] [--non-empty]

14 [--local] [--incremental] [--window=<n>] [--depth=<n>]

15 - [--revs [--unpacked | --all]*] [--stdout | base-name]

15 + [--revs [--unpacked | --all]] [--stdout | base-name]

16 [--keep-true-parents] < object-list

17

18

Documentation/git-relink.txt

+1 -1

@@ -7,7 +7,7 @@ git-relink - Hardlink common objects in local repositories

7

8 SYNOPSIS

9 --------

10 -'git relink' [--safe] <dir> [<dir>]* <master_dir>

10 +'git relink' [--safe] <dir>... <master_dir>

11

12 DESCRIPTION

13 -----------

Documentation/git-remote.txt

+1 -1

@@ -20,7 +20,7 @@ SYNOPSIS

20 'git remote set-url --delete' [--push] <name> <url>

21 'git remote' [-v | --verbose] 'show' [-n] <name>

22 'git remote prune' [-n | --dry-run] <name>

23 -'git remote' [-v | --verbose] 'update' [-p | --prune] [<group> | <remote>]...

23 +'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]

24

25 DESCRIPTION

26 -----------

Documentation/git-rev-list.txt

+1 -1

@@ -37,7 +37,7 @@ SYNOPSIS

37 [ \--regexp-ignore-case | -i ]

38 [ \--extended-regexp | -E ]

39 [ \--fixed-strings | -F ]

40 - [ \--date={local|relative|default|iso|rfc|short} ]

41 [ [\--objects | \--objects-edge] [ \--unpacked ] ]

42 [ \--pretty | \--header ]

43 [ \--bisect ]

Documentation/git-rev-parse.txt

+1 -1

@@ -95,7 +95,7 @@ OPTIONS

95 unfortunately named tag "master"), and show them as full

96 refnames (e.g. "refs/heads/master").

97

98 ---abbrev-ref[={strict|loose}]::

98 +--abbrev-ref[=(strict|loose)]::

99 A non-ambiguous short name of the objects name.

100 The option core.warnAmbiguousRefs is used to select the strict

101 abbreviation mode.

Documentation/git-show-branch.txt

+1 -1

@@ -12,7 +12,7 @@ SYNOPSIS

12 [--current] [--color[=<when>] | --no-color] [--sparse]

13 [--more=<n> | --list | --independent | --merge-base]

14 [--no-name | --sha1-name] [--topics]

15 - [<rev> | <glob>]...

15 + [(<rev> | <glob>)...]

16

17 'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]

18

Documentation/git-svn.txt

+1 -1

@@ -438,7 +438,7 @@ git rebase --onto remotes/git-svn A^ master

438 OPTIONS

439 -------

440

441 ---shared[={false|true|umask|group|all|world|everybody}]::

442 --template=<template_directory>::

443 Only used with the 'init' command.

444 These are passed directly to 'git init'.

Documentation/git-update-index.txt

+2 -2

@@ -12,7 +12,7 @@ SYNOPSIS

12 'git update-index'

13 [--add] [--remove | --force-remove] [--replace]

14 [--refresh] [-q] [--unmerged] [--ignore-missing]

15 - [--cacheinfo <mode> <object> <file>]*

15 + [(--cacheinfo <mode> <object> <file>)...]

16 [--chmod=(+|-)x]

17 [--assume-unchanged | --no-assume-unchanged]

18 [--skip-worktree | --no-skip-worktree]

@@ -21,7 +21,7 @@ SYNOPSIS

21 [--info-only] [--index-info]

22 [-z] [--stdin]

23 [--verbose]

24 - [--] [<file>]*

24 + [--] [<file>...]

25

26 DESCRIPTION

27 -----------

Documentation/rev-list-options.txt

+1 -1

@@ -13,7 +13,7 @@ include::pretty-options.txt[]

13

14 Synonym for `--date=relative`.

15

16 ---date={relative,local,default,iso,rfc,short,raw}::

16 +--date=(relative|local|default|iso|rfc|short|raw)::

17

18 Only takes effect for dates shown in human-readable format, such

19 as when using "--pretty". `log.date` config variable sets a default

Documentation/user-manual.txt

+1 -1

@@ -3850,7 +3850,7 @@ You create a commit object by giving it the tree that describes the

3850 state at the time of the commit, and a list of parents:

3851

3852 -------------------------------------------------

3853 -$ git commit-tree <tree> -p <parent> [-p <parent2> ..]

3853 +$ git commit-tree <tree> -p <parent> [(-p <parent2>)...]

3854 -------------------------------------------------

3855

3856 and then giving the reason for the commit on stdin (either through

builtin/commit-tree.c

+1 -1

@@ -9,7 +9,7 @@

9 #include "builtin.h"

10 #include "utf8.h"

11

12 -static const char commit_tree_usage[] = "git commit-tree <sha1> [-p <sha1>]* < changelog";

12 +static const char commit_tree_usage[] = "git commit-tree <sha1> [(-p <sha1>)...] < changelog";

13

14 static void new_parent(struct commit *parent, struct commit_list **parents_p)

15 {

builtin/fetch.c

+1 -1

@@ -16,7 +16,7 @@

16 static const char * const builtin_fetch_usage[] = {

17 "git fetch [<options>] [<repository> [<refspec>...]]",

18 "git fetch [<options>] <group>",

19 - "git fetch --multiple [<options>] [<repository> | <group>]...",

19 + "git fetch --multiple [<options>] [(<repository> | <group>)...]",

20 "git fetch --all [<options>]",

21 NULL

22 };

builtin/index-pack.c

+1 -1

@@ -11,7 +11,7 @@

11 #include "exec_cmd.h"

12

13 static const char index_pack_usage[] =

14 -"git index-pack [-v] [-o <index-file>] [{ --keep | --keep=<msg> }] [--strict] { <pack-file> | --stdin [--fix-thin] [<pack-file>] }";

14 +"git index-pack [-v] [-o <index-file>] [ --keep | --keep=<msg> ] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";

15

16 struct object_entry

17 {

builtin/ls-files.c

+1 -1

@@ -424,7 +424,7 @@ int report_path_error(const char *ps_matched, const char **pathspec, int prefix_

424 }

425

426 static const char * const ls_files_usage[] = {

427 - "git ls-files [options] [<file>]*",

427 + "git ls-files [options] [<file>...]",

428 NULL

429 };

430

builtin/mailsplit.c

+1 -1

@@ -10,7 +10,7 @@

10 #include "strbuf.h"

11

12 static const char git_mailsplit_usage[] =

13 -"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [<mbox>|<Maildir>...]";

13 +"git mailsplit [-d<prec>] [-f<n>] [-b] [--keep-cr] -o<directory> [(<mbox>|<Maildir>)...]";

14

15 static int is_from_line(const char *line, int len)

16 {

builtin/pack-objects.c

+1 -1

@@ -23,7 +23,7 @@

23 #endif

24

25 static const char pack_usage[] =

26 - "git pack-objects [{ -q | --progress | --all-progress }]\n"

26 + "git pack-objects [ -q | --progress | --all-progress ]\n"

27 " [--all-progress-implied]\n"

28 " [--max-pack-size=<n>] [--local] [--incremental]\n"

29 " [--window=<n>] [--window-memory=<n>] [--depth=<n>]\n"

builtin/remote.c

+1 -1

@@ -15,7 +15,7 @@ static const char * const builtin_remote_usage[] = {

15 "git remote set-head <name> (-a | -d | <branch>)",

16 "git remote [-v | --verbose] show [-n] <name>",

17 "git remote prune [-n | --dry-run] <name>",

18 - "git remote [-v | --verbose] update [-p | --prune] [<group> | <remote>]",

18 + "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]",

19 "git remote set-branches <name> [--add] <branch>...",

20 "git remote set-url <name> <newurl> [<oldurl>]",

21 "git remote set-url --add <name> <newurl>",

builtin/show-branch.c

+1 -1

@@ -6,7 +6,7 @@

6 #include "parse-options.h"

7

8 static const char* show_branch_usage[] = {

10 "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]",

11 NULL

12 };

git-am.sh

+1 -1

@@ -5,7 +5,7 @@

5 SUBDIRECTORY_OK=Yes

6 OPTIONS_KEEPDASHDASH=

7 OPTIONS_SPEC="\

8 -git am [options] [<mbox>|<Maildir>...]

8 +git am [options] [(<mbox>|<Maildir>)...]

9 git am [options] (--resolved | --skip | --abort)

10 --

11 i,interactive run interactively

git-relink.perl

+1 -1

@@ -163,7 +163,7 @@ sub link_two_files($$) {

163

164

165 sub usage() {

166 - print("Usage: git relink [--safe] <dir> [<dir> ...] <master_dir> \n");

166 + print("Usage: git relink [--safe] <dir>... <master_dir> \n");

167 print("All directories should contain a .git/objects/ subdirectory.\n");

168 print("Options\n");

169 print("\t--safe\t" .

Use parentheses and `...' where appropriate