Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
This commit is contained in:
commit
d59c12d7ad
@ -91,13 +91,13 @@ For shell scripts specifically (not exhaustive):
|
|||||||
E.g.: my_function () {
|
E.g.: my_function () {
|
||||||
|
|
||||||
- As to use of grep, stick to a subset of BRE (namely, no \{m,n\},
|
- As to use of grep, stick to a subset of BRE (namely, no \{m,n\},
|
||||||
[::], [==], nor [..]) for portability.
|
[::], [==], or [..]) for portability.
|
||||||
|
|
||||||
- We do not use \{m,n\};
|
- We do not use \{m,n\};
|
||||||
|
|
||||||
- We do not use -E;
|
- We do not use -E;
|
||||||
|
|
||||||
- We do not use ? nor + (which are \{0,1\} and \{1,\}
|
- We do not use ? or + (which are \{0,1\} and \{1,\}
|
||||||
respectively in BRE) but that goes without saying as these
|
respectively in BRE) but that goes without saying as these
|
||||||
are ERE elements not BRE (note that \? and \+ are not even part
|
are ERE elements not BRE (note that \? and \+ are not even part
|
||||||
of BRE -- making them accessible from BRE is a GNU extension).
|
of BRE -- making them accessible from BRE is a GNU extension).
|
||||||
|
@ -78,8 +78,8 @@ be escaped: use `\"` for `"` and `\\` for `\`.
|
|||||||
|
|
||||||
The following escape sequences (beside `\"` and `\\`) are recognized:
|
The following escape sequences (beside `\"` and `\\`) are recognized:
|
||||||
`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
|
`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
|
||||||
and `\b` for backspace (BS). No other char escape sequence, nor octal
|
and `\b` for backspace (BS). Other char escape sequences (including octal
|
||||||
char sequences are valid.
|
escape sequences) are invalid.
|
||||||
|
|
||||||
Variable values ending in a `\` are continued on the next line in the
|
Variable values ending in a `\` are continued on the next line in the
|
||||||
customary UNIX fashion.
|
customary UNIX fashion.
|
||||||
@ -826,7 +826,7 @@ color.diff::
|
|||||||
commands will only use color when output is to the terminal.
|
commands will only use color when output is to the terminal.
|
||||||
Defaults to false.
|
Defaults to false.
|
||||||
+
|
+
|
||||||
This does not affect linkgit:git-format-patch[1] nor the
|
This does not affect linkgit:git-format-patch[1] or the
|
||||||
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
|
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
|
||||||
command line with the `--color[=<when>]` option.
|
command line with the `--color[=<when>]` option.
|
||||||
|
|
||||||
|
@ -174,7 +174,7 @@ added, from the point of view of that parent).
|
|||||||
In the above example output, the function signature was changed
|
In the above example output, the function signature was changed
|
||||||
from both files (hence two `-` removals from both file1 and
|
from both files (hence two `-` removals from both file1 and
|
||||||
file2, plus `++` to mean one line that was added does not appear
|
file2, plus `++` to mean one line that was added does not appear
|
||||||
in either file1 nor file2). Also eight other lines are the same
|
in either file1 or file2). Also eight other lines are the same
|
||||||
from file1 but do not appear in file2 (hence prefixed with `+`).
|
from file1 but do not appear in file2 (hence prefixed with `+`).
|
||||||
|
|
||||||
When shown by `git diff-tree -c`, it compares the parents of a
|
When shown by `git diff-tree -c`, it compares the parents of a
|
||||||
|
@ -358,7 +358,7 @@ endif::git-log[]
|
|||||||
--irreversible-delete::
|
--irreversible-delete::
|
||||||
Omit the preimage for deletes, i.e. print only the header but not
|
Omit the preimage for deletes, i.e. print only the header but not
|
||||||
the diff between the preimage and `/dev/null`. The resulting patch
|
the diff between the preimage and `/dev/null`. The resulting patch
|
||||||
is not meant to be applied with `patch` nor `git apply`; this is
|
is not meant to be applied with `patch` or `git apply`; this is
|
||||||
solely for people who want to just concentrate on reviewing the
|
solely for people who want to just concentrate on reviewing the
|
||||||
text after the change. In addition, the output obviously lack
|
text after the change. In addition, the output obviously lack
|
||||||
enough information to apply such a patch in reverse, even manually,
|
enough information to apply such a patch in reverse, even manually,
|
||||||
|
@ -263,7 +263,7 @@ that are not quite ready.
|
|||||||
<5> create topic branch as needed and apply, again with my
|
<5> create topic branch as needed and apply, again with my
|
||||||
sign-offs.
|
sign-offs.
|
||||||
<6> rebase internal topic branch that has not been merged to the
|
<6> rebase internal topic branch that has not been merged to the
|
||||||
master, nor exposed as a part of a stable branch.
|
master or exposed as a part of a stable branch.
|
||||||
<7> restart `pu` every time from the next.
|
<7> restart `pu` every time from the next.
|
||||||
<8> and bundle topic branches still cooking.
|
<8> and bundle topic branches still cooking.
|
||||||
<9> backport a critical fix.
|
<9> backport a critical fix.
|
||||||
|
@ -300,9 +300,9 @@ patch::
|
|||||||
|
|
||||||
y - stage this hunk
|
y - stage this hunk
|
||||||
n - do not stage this hunk
|
n - do not stage this hunk
|
||||||
q - quit; do not stage this hunk nor any of the remaining ones
|
q - quit; do not stage this hunk or any of the remaining ones
|
||||||
a - stage this hunk and all later hunks in the file
|
a - stage this hunk and all later hunks in the file
|
||||||
d - do not stage this hunk nor any of the later hunks in the file
|
d - do not stage this hunk or any of the later hunks in the file
|
||||||
g - select a hunk to go to
|
g - select a hunk to go to
|
||||||
/ - search for a hunk matching the given regex
|
/ - search for a hunk matching the given regex
|
||||||
j - leave this hunk undecided, see next undecided hunk
|
j - leave this hunk undecided, see next undecided hunk
|
||||||
|
@ -33,8 +33,8 @@ size-pack: disk space consumed by the packs, in KiB (unless -H is specified)
|
|||||||
prune-packable: the number of loose objects that are also present in
|
prune-packable: the number of loose objects that are also present in
|
||||||
the packs. These objects could be pruned using `git prune-packed`.
|
the packs. These objects could be pruned using `git prune-packed`.
|
||||||
+
|
+
|
||||||
garbage: the number of files in object database that are not valid
|
garbage: the number of files in object database that are neither valid loose
|
||||||
loose objects nor valid packs
|
objects nor valid packs
|
||||||
+
|
+
|
||||||
size-garbage: disk space consumed by garbage files, in KiB (unless -H is
|
size-garbage: disk space consumed by garbage files, in KiB (unless -H is
|
||||||
specified)
|
specified)
|
||||||
|
@ -158,8 +158,8 @@ $ git diff --name-status <2>
|
|||||||
$ git diff arch/i386 include/asm-i386 <3>
|
$ git diff arch/i386 include/asm-i386 <3>
|
||||||
------------
|
------------
|
||||||
+
|
+
|
||||||
<1> Show only modification, rename and copy, but not addition
|
<1> Show only modification, rename, and copy, but not addition
|
||||||
nor deletion.
|
or deletion.
|
||||||
<2> Show only names and the nature of change, but not actual
|
<2> Show only names and the nature of change, but not actual
|
||||||
diff output.
|
diff output.
|
||||||
<3> Limit diff output to named subtrees.
|
<3> Limit diff output to named subtrees.
|
||||||
|
@ -56,7 +56,7 @@ OPTIONS
|
|||||||
EXAMPLE
|
EXAMPLE
|
||||||
-------
|
-------
|
||||||
|
|
||||||
To prune objects not used by your repository nor another that
|
To prune objects not used by your repository or another that
|
||||||
borrows from your repository via its
|
borrows from your repository via its
|
||||||
`.git/objects/info/alternates`:
|
`.git/objects/info/alternates`:
|
||||||
|
|
||||||
|
@ -385,7 +385,7 @@ will now start building on top of B.
|
|||||||
The command by default does not allow an update that is not a fast-forward
|
The command by default does not allow an update that is not a fast-forward
|
||||||
to prevent such loss of history.
|
to prevent such loss of history.
|
||||||
|
|
||||||
If you do not want to lose your work (history from X to B) nor the work by
|
If you do not want to lose your work (history from X to B) or the work by
|
||||||
the other person (history from X to A), you would need to first fetch the
|
the other person (history from X to A), you would need to first fetch the
|
||||||
history from the repository, create a history that contains changes done
|
history from the repository, create a history that contains changes done
|
||||||
by both parties, and push the result back.
|
by both parties, and push the result back.
|
||||||
|
@ -57,7 +57,7 @@ OPTIONS
|
|||||||
-n::
|
-n::
|
||||||
--dry-run::
|
--dry-run::
|
||||||
Check if the command would error out, without updating the index
|
Check if the command would error out, without updating the index
|
||||||
nor the files in the working tree for real.
|
or the files in the working tree for real.
|
||||||
|
|
||||||
-v::
|
-v::
|
||||||
Show the progress of checking files out.
|
Show the progress of checking files out.
|
||||||
|
@ -21,7 +21,7 @@ to HEAD in all forms.
|
|||||||
|
|
||||||
'git reset' [-q] [<tree-ish>] [--] <paths>...::
|
'git reset' [-q] [<tree-ish>] [--] <paths>...::
|
||||||
This form resets the index entries for all <paths> to their
|
This form resets the index entries for all <paths> to their
|
||||||
state at <tree-ish>. (It does not affect the working tree, nor
|
state at <tree-ish>. (It does not affect the working tree or
|
||||||
the current branch.)
|
the current branch.)
|
||||||
+
|
+
|
||||||
This means that `git reset <paths>` is the opposite of `git add
|
This means that `git reset <paths>` is the opposite of `git add
|
||||||
@ -51,7 +51,7 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
|
|||||||
+
|
+
|
||||||
--
|
--
|
||||||
--soft::
|
--soft::
|
||||||
Does not touch the index file nor the working tree at all (but
|
Does not touch the index file or the working tree at all (but
|
||||||
resets the head to <commit>, just like all modes do). This leaves
|
resets the head to <commit>, just like all modes do). This leaves
|
||||||
all your changed files "Changes to be committed", as 'git status'
|
all your changed files "Changes to be committed", as 'git status'
|
||||||
would put it.
|
would put it.
|
||||||
@ -118,7 +118,7 @@ and changes with these files are distracting.
|
|||||||
<2> Somebody asks you to pull, and the changes sounds worthy of merging.
|
<2> Somebody asks you to pull, and the changes sounds worthy of merging.
|
||||||
<3> However, you already dirtied the index (i.e. your index does
|
<3> However, you already dirtied the index (i.e. your index does
|
||||||
not match the HEAD commit). But you know the pull you are going
|
not match the HEAD commit). But you know the pull you are going
|
||||||
to make does not affect frotz.c nor filfre.c, so you revert the
|
to make does not affect frotz.c or filfre.c, so you revert the
|
||||||
index changes for these two files. Your changes in working tree
|
index changes for these two files. Your changes in working tree
|
||||||
remain there.
|
remain there.
|
||||||
<4> Then you can pull and merge, leaving frotz.c and filfre.c
|
<4> Then you can pull and merge, leaving frotz.c and filfre.c
|
||||||
|
@ -25,7 +25,7 @@ and/or refs/tags) semi-visually.
|
|||||||
It cannot show more than 29 branches and commits at a time.
|
It cannot show more than 29 branches and commits at a time.
|
||||||
|
|
||||||
It uses `showbranch.default` multi-valued configuration items if
|
It uses `showbranch.default` multi-valued configuration items if
|
||||||
no <rev> nor <glob> is given on the command line.
|
no <rev> or <glob> is given on the command line.
|
||||||
|
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
|
@ -89,7 +89,7 @@ OPTIONS
|
|||||||
Show references matching one or more patterns. Patterns are matched from
|
Show references matching one or more patterns. Patterns are matched from
|
||||||
the end of the full name, and only complete parts are matched, e.g.
|
the end of the full name, and only complete parts are matched, e.g.
|
||||||
'master' matches 'refs/heads/master', 'refs/remotes/origin/master',
|
'master' matches 'refs/heads/master', 'refs/remotes/origin/master',
|
||||||
'refs/tags/jedi/master' but not 'refs/heads/mymaster' nor
|
'refs/tags/jedi/master' but not 'refs/heads/mymaster' or
|
||||||
'refs/remotes/master/jedi'.
|
'refs/remotes/master/jedi'.
|
||||||
|
|
||||||
OUTPUT
|
OUTPUT
|
||||||
|
@ -139,7 +139,7 @@ You fetch from upstream, but not merge.
|
|||||||
$ git fetch upstream
|
$ git fetch upstream
|
||||||
|
|
||||||
This leaves the updated upstream head in .git/FETCH_HEAD but
|
This leaves the updated upstream head in .git/FETCH_HEAD but
|
||||||
does not touch your .git/HEAD nor .git/refs/heads/master.
|
does not touch your .git/HEAD or .git/refs/heads/master.
|
||||||
You run "git rebase" now.
|
You run "git rebase" now.
|
||||||
|
|
||||||
$ git rebase FETCH_HEAD master
|
$ git rebase FETCH_HEAD master
|
||||||
|
@ -54,7 +54,7 @@ where C and D are to fix what was broken in A and B, and you may already
|
|||||||
have some other changes on the mainline after W.
|
have some other changes on the mainline after W.
|
||||||
|
|
||||||
If you merge the updated side branch (with D at its tip), none of the
|
If you merge the updated side branch (with D at its tip), none of the
|
||||||
changes made in A nor B will be in the result, because they were reverted
|
changes made in A or B will be in the result, because they were reverted
|
||||||
by W. That is what Alan saw.
|
by W. That is what Alan saw.
|
||||||
|
|
||||||
Linus explains the situation:
|
Linus explains the situation:
|
||||||
@ -90,7 +90,7 @@ with:
|
|||||||
$ git revert W
|
$ git revert W
|
||||||
|
|
||||||
This history would (ignoring possible conflicts between what W and W..Y
|
This history would (ignoring possible conflicts between what W and W..Y
|
||||||
changed) be equivalent to not having W nor Y at all in the history:
|
changed) be equivalent to not having W or Y at all in the history:
|
||||||
|
|
||||||
---o---o---o---M---x---x-------x----
|
---o---o---o---M---x---x-------x----
|
||||||
/
|
/
|
||||||
|
@ -137,7 +137,7 @@ $ make clean test ;# make sure it did not cause other breakage.
|
|||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
|
|
||||||
Everything is in the good order. I do not need the temporary branch
|
Everything is in the good order. I do not need the temporary branch
|
||||||
nor tag anymore, so remove them:
|
or tag anymore, so remove them:
|
||||||
|
|
||||||
------------------------------------------------
|
------------------------------------------------
|
||||||
$ rm -f .git/refs/tags/pu-anchor
|
$ rm -f .git/refs/tags/pu-anchor
|
||||||
|
@ -63,14 +63,13 @@ merge.
|
|||||||
|
|
||||||
--squash::
|
--squash::
|
||||||
--no-squash::
|
--no-squash::
|
||||||
Produce the working tree and index state as if a real
|
Produce the working tree and index state as if a real merge
|
||||||
merge happened (except for the merge information),
|
happened (except for the merge information), but do not actually
|
||||||
but do not actually make a commit or
|
make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD`
|
||||||
move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
|
(to cause the next `git commit` command to create a merge
|
||||||
cause the next `git commit` command to create a merge
|
commit). This allows you to create a single commit on top of
|
||||||
commit. This allows you to create a single commit on
|
the current branch whose effect is the same as merging another
|
||||||
top of the current branch whose effect is the same as
|
branch (or more in case of an octopus).
|
||||||
merging another branch (or more in case of an octopus).
|
|
||||||
+
|
+
|
||||||
With --no-squash perform the merge and commit the result. This
|
With --no-squash perform the merge and commit the result. This
|
||||||
option can be used to override --squash.
|
option can be used to override --squash.
|
||||||
|
@ -78,7 +78,7 @@ The 'raw' format shows the entire commit exactly as
|
|||||||
stored in the commit object. Notably, the SHA-1s are
|
stored in the commit object. Notably, the SHA-1s are
|
||||||
displayed in full, regardless of whether --abbrev or
|
displayed in full, regardless of whether --abbrev or
|
||||||
--no-abbrev are used, and 'parents' information show the
|
--no-abbrev are used, and 'parents' information show the
|
||||||
true parent commits, without taking grafts nor history
|
true parent commits, without taking grafts or history
|
||||||
simplification into account.
|
simplification into account.
|
||||||
|
|
||||||
* 'format:<string>'
|
* 'format:<string>'
|
||||||
|
@ -39,7 +39,7 @@ people using 80-column terminals.
|
|||||||
Show the notes (see linkgit:git-notes[1]) that annotate the
|
Show the notes (see linkgit:git-notes[1]) that annotate the
|
||||||
commit, when showing the commit log message. This is the default
|
commit, when showing the commit log message. This is the default
|
||||||
for `git log`, `git show` and `git whatchanged` commands when
|
for `git log`, `git show` and `git whatchanged` commands when
|
||||||
there is no `--pretty`, `--format` nor `--oneline` option given
|
there is no `--pretty`, `--format`, or `--oneline` option given
|
||||||
on the command line.
|
on the command line.
|
||||||
+
|
+
|
||||||
By default, the notes shown are from the notes refs listed in the
|
By default, the notes shown are from the notes refs listed in the
|
||||||
|
@ -237,7 +237,7 @@ list.
|
|||||||
reflog entries from the most recent one to older ones.
|
reflog entries from the most recent one to older ones.
|
||||||
When this option is used you cannot specify commits to
|
When this option is used you cannot specify commits to
|
||||||
exclude (that is, '{caret}commit', 'commit1..commit2',
|
exclude (that is, '{caret}commit', 'commit1..commit2',
|
||||||
nor 'commit1\...commit2' notations cannot be used).
|
and 'commit1\...commit2' notations cannot be used).
|
||||||
+
|
+
|
||||||
With `--pretty` format other than `oneline` (for obvious reasons),
|
With `--pretty` format other than `oneline` (for obvious reasons),
|
||||||
this causes the output to have two extra lines of information
|
this causes the output to have two extra lines of information
|
||||||
|
@ -99,7 +99,7 @@ static void setup_check(void)
|
|||||||
The attribute is Unset, by listing the name of the
|
The attribute is Unset, by listing the name of the
|
||||||
attribute prefixed with a dash - for the path.
|
attribute prefixed with a dash - for the path.
|
||||||
} else if (ATTR_UNSET(value)) {
|
} else if (ATTR_UNSET(value)) {
|
||||||
The attribute is not set nor unset for the path.
|
The attribute is neither set nor unset for the path.
|
||||||
} else if (!strcmp(value, "input")) {
|
} else if (!strcmp(value, "input")) {
|
||||||
If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is
|
If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is
|
||||||
true, the value is a string set in the gitattributes
|
true, the value is a string set in the gitattributes
|
||||||
|
@ -237,10 +237,10 @@ The client now sends the maximum commit history depth it wants for
|
|||||||
this transaction, which is the number of commits it wants from the
|
this transaction, which is the number of commits it wants from the
|
||||||
tip of the history, if any, as a 'deepen' line. A depth of 0 is the
|
tip of the history, if any, as a 'deepen' line. A depth of 0 is the
|
||||||
same as not making a depth request. The client does not want to receive
|
same as not making a depth request. The client does not want to receive
|
||||||
any commits beyond this depth, nor objects needed only to complete
|
any commits beyond this depth, nor does it want objects needed only to
|
||||||
those commits. Commits whose parents are not received as a result are
|
complete those commits. Commits whose parents are not received as a
|
||||||
defined as shallow and marked as such in the server. This information
|
result are defined as shallow and marked as such in the server. This
|
||||||
is sent back to the client in the next step.
|
information is sent back to the client in the next step.
|
||||||
|
|
||||||
Once all the 'want's and 'shallow's (and optional 'deepen') are
|
Once all the 'want's and 'shallow's (and optional 'deepen') are
|
||||||
transferred, clients MUST send a flush-pkt, to tell the server side
|
transferred, clients MUST send a flush-pkt, to tell the server side
|
||||||
|
@ -39,7 +39,7 @@ More specifically, they:
|
|||||||
caret `^`, colon `:`, question-mark `?`, asterisk `*`,
|
caret `^`, colon `:`, question-mark `?`, asterisk `*`,
|
||||||
or open bracket `[` anywhere.
|
or open bracket `[` anywhere.
|
||||||
|
|
||||||
. They cannot end with a slash `/` nor a dot `.`.
|
. They cannot end with a slash `/` or a dot `.`.
|
||||||
|
|
||||||
. They cannot end with the sequence `.lock`.
|
. They cannot end with the sequence `.lock`.
|
||||||
|
|
||||||
|
@ -4074,7 +4074,7 @@ the `HEAD` tree, and stage 3 to the `$target` tree.
|
|||||||
|
|
||||||
Earlier we said that trivial merges are done inside
|
Earlier we said that trivial merges are done inside
|
||||||
`git read-tree -m`. For example, if the file did not change
|
`git read-tree -m`. For example, if the file did not change
|
||||||
from `$orig` to `HEAD` nor `$target`, or if the file changed
|
from `$orig` to `HEAD` or `$target`, or if the file changed
|
||||||
from `$orig` to `HEAD` and `$orig` to `$target` the same way,
|
from `$orig` to `HEAD` and `$orig` to `$target` the same way,
|
||||||
obviously the final outcome is what is in `HEAD`. What the
|
obviously the final outcome is what is in `HEAD`. What the
|
||||||
above example shows is that file `hello.c` was changed from
|
above example shows is that file `hello.c` was changed from
|
||||||
|
2
Makefile
2
Makefile
@ -151,7 +151,7 @@ all::
|
|||||||
#
|
#
|
||||||
# Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
|
# Define NEEDS_LIBINTL_BEFORE_LIBICONV if you need libintl before libiconv.
|
||||||
#
|
#
|
||||||
# Define NO_INTPTR_T if you don't have intptr_t nor uintptr_t.
|
# Define NO_INTPTR_T if you don't have intptr_t or uintptr_t.
|
||||||
#
|
#
|
||||||
# Define NO_UINTMAX_T if you don't have uintmax_t.
|
# Define NO_UINTMAX_T if you don't have uintmax_t.
|
||||||
#
|
#
|
||||||
|
@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
|
|||||||
return error(_("cannot open %s: %s"), namebuf, strerror(errno));
|
return error(_("cannot open %s: %s"), namebuf, strerror(errno));
|
||||||
|
|
||||||
/* Normal git tools never deal with .rej, so do not pretend
|
/* Normal git tools never deal with .rej, so do not pretend
|
||||||
* this is a git patch by saying --git nor give extended
|
* this is a git patch by saying --git or giving extended
|
||||||
* headers. While at it, maybe please "kompare" that wants
|
* headers. While at it, maybe please "kompare" that wants
|
||||||
* the trailing TAB and some garbage at the end of line ;-).
|
* the trailing TAB and some garbage at the end of line ;-).
|
||||||
*/
|
*/
|
||||||
|
@ -895,7 +895,7 @@ static int parse_branchname_arg(int argc, const char **argv,
|
|||||||
* between A and B, A...B names that merge base.
|
* between A and B, A...B names that merge base.
|
||||||
*
|
*
|
||||||
* (b) If <something> is _not_ a commit, either "--" is present
|
* (b) If <something> is _not_ a commit, either "--" is present
|
||||||
* or <something> is not a path, no -t nor -b was given, and
|
* or <something> is not a path, no -t or -b was given, and
|
||||||
* and there is a tracking branch whose name is <something>
|
* and there is a tracking branch whose name is <something>
|
||||||
* in one and only one remote, then this is a short-hand to
|
* in one and only one remote, then this is a short-hand to
|
||||||
* fork local <something> from that remote-tracking branch.
|
* fork local <something> from that remote-tracking branch.
|
||||||
|
@ -904,11 +904,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
if (!interactive && !dry_run && !force) {
|
if (!interactive && !dry_run && !force) {
|
||||||
if (config_set)
|
if (config_set)
|
||||||
die(_("clean.requireForce set to true and neither -i, -n nor -f given; "
|
die(_("clean.requireForce set to true and neither -i, -n, nor -f given; "
|
||||||
"refusing to clean"));
|
"refusing to clean"));
|
||||||
else
|
else
|
||||||
die(_("clean.requireForce defaults to true and neither -i, -n nor -f given; "
|
die(_("clean.requireForce defaults to true and neither -i, -n, nor -f given;"
|
||||||
"refusing to clean"));
|
" refusing to clean"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (force > 1)
|
if (force > 1)
|
||||||
|
@ -1128,7 +1128,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
|
|||||||
if (argc == 0 && only && amend)
|
if (argc == 0 && only && amend)
|
||||||
only_include_assumed = _("Clever... amending the last one with dirty index.");
|
only_include_assumed = _("Clever... amending the last one with dirty index.");
|
||||||
if (argc > 0 && !also && !only)
|
if (argc > 0 && !also && !only)
|
||||||
only_include_assumed = _("Explicit paths specified without -i nor -o; assuming --only paths...");
|
only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths...");
|
||||||
if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
|
if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
|
||||||
cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
|
cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
|
||||||
else if (!strcmp(cleanup_arg, "verbatim"))
|
else if (!strcmp(cleanup_arg, "verbatim"))
|
||||||
|
@ -503,7 +503,7 @@ static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *
|
|||||||
/* There was no "-m" on the command line */
|
/* There was no "-m" on the command line */
|
||||||
rev->ignore_merges = 0;
|
rev->ignore_merges = 0;
|
||||||
if (!rev->first_parent_only && !rev->combine_merges) {
|
if (!rev->first_parent_only && !rev->combine_merges) {
|
||||||
/* No "--first-parent", "-c", nor "--cc" */
|
/* No "--first-parent", "-c", or "--cc" */
|
||||||
rev->combine_merges = 1;
|
rev->combine_merges = 1;
|
||||||
rev->dense_combined_merges = 1;
|
rev->dense_combined_merges = 1;
|
||||||
}
|
}
|
||||||
|
@ -1076,7 +1076,7 @@ static int pbase_tree_cache_ix_incr(int ix)
|
|||||||
static struct pbase_tree {
|
static struct pbase_tree {
|
||||||
struct pbase_tree *next;
|
struct pbase_tree *next;
|
||||||
/* This is a phony "cache" entry; we are not
|
/* This is a phony "cache" entry; we are not
|
||||||
* going to evict it nor find it through _get()
|
* going to evict it or find it through _get()
|
||||||
* mechanism -- this is for the toplevel node that
|
* mechanism -- this is for the toplevel node that
|
||||||
* would almost always change with any commit.
|
* would almost always change with any commit.
|
||||||
*/
|
*/
|
||||||
|
4
column.c
4
column.c
@ -311,8 +311,8 @@ static int parse_config(unsigned int *colopts, const char *value)
|
|||||||
value += strspn(value, sep);
|
value += strspn(value, sep);
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* Setting layout implies "always" if neither always, never
|
* If none of "always", "never", and "auto" is specified, then setting
|
||||||
* nor auto is specified.
|
* layout implies "always".
|
||||||
*
|
*
|
||||||
* Current value in COL_ENABLE_MASK is disregarded. This means if
|
* Current value in COL_ENABLE_MASK is disregarded. This means if
|
||||||
* you set column.ui = auto and pass --column=row, then "auto"
|
* you set column.ui = auto and pass --column=row, then "auto"
|
||||||
|
@ -168,7 +168,7 @@ cd_to_toplevel
|
|||||||
# branch. However, if "git checkout HEAD" detaches the HEAD
|
# branch. However, if "git checkout HEAD" detaches the HEAD
|
||||||
# from the current branch, even though that may be logically
|
# from the current branch, even though that may be logically
|
||||||
# correct, it feels somewhat funny. More importantly, we do not
|
# correct, it feels somewhat funny. More importantly, we do not
|
||||||
# want "git checkout" nor "git checkout -f" to detach HEAD.
|
# want "git checkout" or "git checkout -f" to detach HEAD.
|
||||||
|
|
||||||
detached=
|
detached=
|
||||||
detach_warn=
|
detach_warn=
|
||||||
|
@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in
|
|||||||
0,,,*)
|
0,,,*)
|
||||||
;;
|
;;
|
||||||
*,,,*)
|
*,,,*)
|
||||||
only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
|
only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
|
||||||
also=
|
also=
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -40,7 +40,7 @@ case "$1" in --) shift ;; esac
|
|||||||
|
|
||||||
# git reset --mixed tree [--] paths... can be used to
|
# git reset --mixed tree [--] paths... can be used to
|
||||||
# load chosen paths from the tree into the index without
|
# load chosen paths from the tree into the index without
|
||||||
# affecting the working tree nor HEAD.
|
# affecting the working tree or HEAD.
|
||||||
if test $# != 0
|
if test $# != 0
|
||||||
then
|
then
|
||||||
test "$reset_type" = "--mixed" ||
|
test "$reset_type" = "--mixed" ||
|
||||||
@ -60,7 +60,7 @@ then
|
|||||||
update=-u
|
update=-u
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Soft reset does not touch the index file nor the working tree
|
# Soft reset does not touch the index file or the working tree
|
||||||
# at all, but requires them in a good order. Other resets reset
|
# at all, but requires them in a good order. Other resets reset
|
||||||
# the index file to the tree object we are switching to.
|
# the index file to the tree object we are switching to.
|
||||||
if test "$reset_type" = "--soft"
|
if test "$reset_type" = "--soft"
|
||||||
|
@ -109,8 +109,8 @@ was available previously is not included in this revision, it will
|
|||||||
be removed.
|
be removed.
|
||||||
|
|
||||||
If an on-disk revision is incomplete, you can point to files from
|
If an on-disk revision is incomplete, you can point to files from
|
||||||
a previous revision. There are no restriction as to where the source
|
a previous revision. There are no restrictions on where the source
|
||||||
files are located, nor to the names of them.
|
files are located, nor on their names.
|
||||||
|
|
||||||
[3.files]
|
[3.files]
|
||||||
; the key is the path inside the repository, the value is the path
|
; the key is the path inside the repository, the value is the path
|
||||||
|
@ -40,8 +40,8 @@ manual page.
|
|||||||
NOTES
|
NOTES
|
||||||
-----
|
-----
|
||||||
Subversion dumps do not record a separate author and committer for
|
Subversion dumps do not record a separate author and committer for
|
||||||
each revision, nor a separate display name and email address for
|
each revision, nor do they record a separate display name and email
|
||||||
each author. Like git-svn(1), 'svn-fe' will use the name
|
address for each author. Like git-svn(1), 'svn-fe' will use the name
|
||||||
|
|
||||||
---------
|
---------
|
||||||
user <user@UUID>
|
user <user@UUID>
|
||||||
|
2
delta.h
2
delta.h
@ -9,7 +9,7 @@ struct delta_index;
|
|||||||
*
|
*
|
||||||
* This returns a pointer to a struct delta_index that should be passed to
|
* This returns a pointer to a struct delta_index that should be passed to
|
||||||
* subsequent create_delta() calls, or to free_delta_index(). A NULL pointer
|
* subsequent create_delta() calls, or to free_delta_index(). A NULL pointer
|
||||||
* is returned on failure. The given buffer must not be freed nor altered
|
* is returned on failure. The given buffer must not be freed or altered
|
||||||
* before free_delta_index() is called. The returned pointer must be freed
|
* before free_delta_index() is called. The returned pointer must be freed
|
||||||
* using free_delta_index().
|
* using free_delta_index().
|
||||||
*/
|
*/
|
||||||
|
2
diff.c
2
diff.c
@ -3927,7 +3927,7 @@ static int diff_scoreopt_parse(const char *opt)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (cmd != 'M' && cmd != 'C' && cmd != 'B')
|
if (cmd != 'M' && cmd != 'C' && cmd != 'B')
|
||||||
return -1; /* that is not a -M, -C nor -B option */
|
return -1; /* that is not a -M, -C, or -B option */
|
||||||
|
|
||||||
opt1 = parse_rename_score(&opt);
|
opt1 = parse_rename_score(&opt);
|
||||||
if (cmd != 'B')
|
if (cmd != 'B')
|
||||||
|
@ -1159,9 +1159,9 @@ sub help_patch_cmd {
|
|||||||
print colored $help_color, <<EOF ;
|
print colored $help_color, <<EOF ;
|
||||||
y - $verb this hunk$target
|
y - $verb this hunk$target
|
||||||
n - do not $verb this hunk$target
|
n - do not $verb this hunk$target
|
||||||
q - quit; do not $verb this hunk nor any of the remaining ones
|
q - quit; do not $verb this hunk or any of the remaining ones
|
||||||
a - $verb this hunk and all later hunks in the file
|
a - $verb this hunk and all later hunks in the file
|
||||||
d - do not $verb this hunk nor any of the later hunks in the file
|
d - do not $verb this hunk or any of the later hunks in the file
|
||||||
g - select a hunk to go to
|
g - select a hunk to go to
|
||||||
/ - search for a hunk matching the given regex
|
/ - search for a hunk matching the given regex
|
||||||
j - leave this hunk undecided, see next undecided hunk
|
j - leave this hunk undecided, see next undecided hunk
|
||||||
|
@ -530,7 +530,7 @@ Use \"git am --abort\" to remove it.")"
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Make sure we are not given --skip, --continue, nor --abort
|
# Make sure we are not given --skip, --continue, or --abort
|
||||||
test "$skip$resolved$abort" = "" ||
|
test "$skip$resolved$abort" = "" ||
|
||||||
die "$(gettext "Resolve operation not in progress, we are not resuming.")"
|
die "$(gettext "Resolve operation not in progress, we are not resuming.")"
|
||||||
|
|
||||||
|
@ -1490,7 +1490,7 @@ sub is_valid_pathname {
|
|||||||
my $input = shift;
|
my $input = shift;
|
||||||
|
|
||||||
return undef unless defined $input;
|
return undef unless defined $input;
|
||||||
# no '.' or '..' as elements of path, i.e. no '.' nor '..'
|
# no '.' or '..' as elements of path, i.e. no '.' or '..'
|
||||||
# at the beginning, at the end, and between slashes.
|
# at the beginning, at the end, and between slashes.
|
||||||
# also this catches doubled slashes
|
# also this catches doubled slashes
|
||||||
if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
|
if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {
|
||||||
|
3
http.h
3
http.h
@ -13,8 +13,7 @@
|
|||||||
/*
|
/*
|
||||||
* We detect based on the cURL version if multi-transfer is
|
* We detect based on the cURL version if multi-transfer is
|
||||||
* usable in this implementation and define this symbol accordingly.
|
* usable in this implementation and define this symbol accordingly.
|
||||||
* This is not something Makefile should set nor users should pass
|
* This shouldn't be set by the Makefile or by the user (e.g. via CFLAGS).
|
||||||
* via CFLAGS.
|
|
||||||
*/
|
*/
|
||||||
#undef USE_CURL_MULTI
|
#undef USE_CURL_MULTI
|
||||||
|
|
||||||
|
@ -480,8 +480,8 @@ sub refname {
|
|||||||
# It cannot end with a slash /, we'll throw up on this because
|
# It cannot end with a slash /, we'll throw up on this because
|
||||||
# SVN can't have directories with a slash in their name, either:
|
# SVN can't have directories with a slash in their name, either:
|
||||||
if ($refname =~ m{/$}) {
|
if ($refname =~ m{/$}) {
|
||||||
die "ref: '$refname' ends with a trailing slash, this is ",
|
die "ref: '$refname' ends with a trailing slash; this is ",
|
||||||
"not permitted by git nor Subversion\n";
|
"not permitted by git or Subversion\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
# It cannot have ASCII control character space, tilde ~, caret ^,
|
# It cannot have ASCII control character space, tilde ~, caret ^,
|
||||||
@ -1191,7 +1191,7 @@ sub do_fetch {
|
|||||||
# we can have a branch that was deleted, then re-added
|
# we can have a branch that was deleted, then re-added
|
||||||
# under the same name but copied from another path, in
|
# under the same name but copied from another path, in
|
||||||
# which case we'll have multiple parents (we don't
|
# which case we'll have multiple parents (we don't
|
||||||
# want to break the original ref, nor lose copypath info):
|
# want to break the original ref or lose copypath info):
|
||||||
if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
|
if (my $log_entry = $self->find_parent_branch($paths, $rev)) {
|
||||||
push @{$log_entry->{parents}}, $lc;
|
push @{$log_entry->{parents}}, $lc;
|
||||||
return $log_entry;
|
return $log_entry;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package Git::SVN::Migration;
|
package Git::SVN::Migration;
|
||||||
# these version numbers do NOT correspond to actual version numbers
|
# these version numbers do NOT correspond to actual version numbers
|
||||||
# of git nor git-svn. They are just relative.
|
# of git or git-svn. They are just relative.
|
||||||
#
|
#
|
||||||
# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
|
# v0 layout: .git/$id/info/url, refs/heads/$id-HEAD
|
||||||
#
|
#
|
||||||
|
@ -28,10 +28,10 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
|
|||||||
* Read a packetized line into the buffer, which must be at least size bytes
|
* Read a packetized line into the buffer, which must be at least size bytes
|
||||||
* long. The return value specifies the number of bytes read into the buffer.
|
* long. The return value specifies the number of bytes read into the buffer.
|
||||||
*
|
*
|
||||||
* If src_buffer is not NULL (and nor is *src_buffer), it should point to a
|
* If src_buffer and *src_buffer are not NULL, it should point to a buffer
|
||||||
* buffer containing the packet data to parse, of at least *src_len bytes.
|
* containing the packet data to parse, of at least *src_len bytes. After the
|
||||||
* After the function returns, src_buf will be incremented and src_len
|
* function returns, src_buf will be incremented and src_len decremented by the
|
||||||
* decremented by the number of bytes consumed.
|
* number of bytes consumed.
|
||||||
*
|
*
|
||||||
* If src_buffer (or *src_buffer) is NULL, then data is read from the
|
* If src_buffer (or *src_buffer) is NULL, then data is read from the
|
||||||
* descriptor "fd".
|
* descriptor "fd".
|
||||||
|
2
remote.c
2
remote.c
@ -1481,7 +1481,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
|
|||||||
/*
|
/*
|
||||||
* Remote doesn't have it, and we have no
|
* Remote doesn't have it, and we have no
|
||||||
* explicit pattern, and we don't have
|
* explicit pattern, and we don't have
|
||||||
* --all nor --mirror.
|
* --all or --mirror.
|
||||||
*/
|
*/
|
||||||
goto free_name;
|
goto free_name;
|
||||||
|
|
||||||
|
@ -790,7 +790,7 @@ void close_pack_index(struct packed_git *p)
|
|||||||
* contain the same set of objects as an existing one. In that case
|
* contain the same set of objects as an existing one. In that case
|
||||||
* the resulting file might be different even if its name would be the
|
* the resulting file might be different even if its name would be the
|
||||||
* same. It is best to close any reference to the old pack before it is
|
* same. It is best to close any reference to the old pack before it is
|
||||||
* replaced on disk. Of course no index pointers nor windows for given pack
|
* replaced on disk. Of course no index pointers or windows for given pack
|
||||||
* must subsist at this point. If ever objects from this pack are requested
|
* must subsist at this point. If ever objects from this pack are requested
|
||||||
* again, the new version of the pack will be reinitialized through
|
* again, the new version of the pack will be reinitialized through
|
||||||
* reprepare_packed_git().
|
* reprepare_packed_git().
|
||||||
@ -1126,7 +1126,7 @@ static void report_helper(const struct string_list *list,
|
|||||||
const char *msg;
|
const char *msg;
|
||||||
switch (seen_bits) {
|
switch (seen_bits) {
|
||||||
case 0:
|
case 0:
|
||||||
msg = "no corresponding .idx nor .pack";
|
msg = "no corresponding .idx or .pack";
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
msg = "no corresponding .idx";
|
msg = "no corresponding .idx";
|
||||||
|
@ -18,7 +18,7 @@ In the test, these paths are used:
|
|||||||
frotz - not in H added in M
|
frotz - not in H added in M
|
||||||
nitfol - in H, stays in M unmodified
|
nitfol - in H, stays in M unmodified
|
||||||
rezrov - in H, deleted in M
|
rezrov - in H, deleted in M
|
||||||
yomin - not in H nor M
|
yomin - not in H or M
|
||||||
'
|
'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
. "$TEST_DIRECTORY"/lib-read-tree.sh
|
. "$TEST_DIRECTORY"/lib-read-tree.sh
|
||||||
|
@ -66,7 +66,7 @@ test_expect_success \
|
|||||||
|
|
||||||
# tree has COPYING and rezrov. work tree has the same COPYING and
|
# tree has COPYING and rezrov. work tree has the same COPYING and
|
||||||
# copy-edited COPYING.1, and unchanged rezrov. We should not say
|
# copy-edited COPYING.1, and unchanged rezrov. We should not say
|
||||||
# anything about rezrov nor COPYING, since the revised again diff-raw
|
# anything about rezrov or COPYING, since the revised again diff-raw
|
||||||
# nows how to say Copy.
|
# nows how to say Copy.
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
|
@ -73,7 +73,7 @@ test_expect_success \
|
|||||||
|
|
||||||
# tree has COPYING and rezrov. work tree has the same COPYING and
|
# tree has COPYING and rezrov. work tree has the same COPYING and
|
||||||
# copy-edited COPYING.1, and unchanged rezrov. We should not say
|
# copy-edited COPYING.1, and unchanged rezrov. We should not say
|
||||||
# anything about rezrov nor COPYING, since the revised again diff-raw
|
# anything about rezrov or COPYING, since the revised again diff-raw
|
||||||
# nows how to say Copy.
|
# nows how to say Copy.
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
|
@ -213,7 +213,7 @@ test_expect_success 'garbage report in count-objects -v' '
|
|||||||
warning: garbage found: .git/objects/pack/fake.bar
|
warning: garbage found: .git/objects/pack/fake.bar
|
||||||
warning: garbage found: .git/objects/pack/foo
|
warning: garbage found: .git/objects/pack/foo
|
||||||
warning: garbage found: .git/objects/pack/foo.bar
|
warning: garbage found: .git/objects/pack/foo.bar
|
||||||
warning: no corresponding .idx nor .pack: .git/objects/pack/fake2.keep
|
warning: no corresponding .idx or .pack: .git/objects/pack/fake2.keep
|
||||||
warning: no corresponding .idx: .git/objects/pack/foo.keep
|
warning: no corresponding .idx: .git/objects/pack/foo.keep
|
||||||
warning: no corresponding .idx: .git/objects/pack/foo.pack
|
warning: no corresponding .idx: .git/objects/pack/foo.pack
|
||||||
warning: no corresponding .pack: .git/objects/pack/fake3.idx
|
warning: no corresponding .pack: .git/objects/pack/fake3.idx
|
||||||
|
@ -388,7 +388,7 @@ test_expect_failure 'git detects conflict w/ criss-cross+contrived resolution' '
|
|||||||
|
|
||||||
#
|
#
|
||||||
# criss-cross + d/f conflict via add/add:
|
# criss-cross + d/f conflict via add/add:
|
||||||
# Commit A: Neither file 'a' nor directory 'a/' exist.
|
# Commit A: Neither file 'a' nor directory 'a/' exists.
|
||||||
# Commit B: Introduce 'a'
|
# Commit B: Introduce 'a'
|
||||||
# Commit C: Introduce 'a/file'
|
# Commit C: Introduce 'a/file'
|
||||||
# Commit D: Merge B & C, keeping 'a' and deleting 'a/'
|
# Commit D: Merge B & C, keeping 'a' and deleting 'a/'
|
||||||
|
@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' '
|
|||||||
|
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'reset --hard did not corrupt index nor cached-tree' '
|
test_expect_success 'reset --hard did not corrupt index or cached-tree' '
|
||||||
|
|
||||||
T=$(git write-tree) &&
|
T=$(git write-tree) &&
|
||||||
rm -f .git/index &&
|
rm -f .git/index &&
|
||||||
|
@ -511,7 +511,7 @@ test_expect_success 'cvs co -c (shows module database)' '
|
|||||||
# Known issues with git-cvsserver current log output:
|
# Known issues with git-cvsserver current log output:
|
||||||
# - Hard coded "lines: +2 -3" placeholder, instead of real numbers.
|
# - Hard coded "lines: +2 -3" placeholder, instead of real numbers.
|
||||||
# - CVS normally does not internally add a blank first line
|
# - CVS normally does not internally add a blank first line
|
||||||
# nor a last line with nothing but a space to log messages.
|
# or a last line with nothing but a space to log messages.
|
||||||
# - The latest cvs 1.12.x server sends +0000 timezone (with some hidden "MT"
|
# - The latest cvs 1.12.x server sends +0000 timezone (with some hidden "MT"
|
||||||
# tagging in the protocol), and if cvs 1.12.x client sees the MT tags,
|
# tagging in the protocol), and if cvs 1.12.x client sees the MT tags,
|
||||||
# it converts to local time zone. git-cvsserver doesn't do the +0000
|
# it converts to local time zone. git-cvsserver doesn't do the +0000
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* This program can either change modification time of the given
|
* This program can either change modification time of the given
|
||||||
* file(s) or just print it. The program does not change atime nor
|
* file(s) or just print it. The program does not change atime or
|
||||||
* ctime (their values are explicitly preserved).
|
* ctime (their values are explicitly preserved).
|
||||||
*
|
*
|
||||||
* The mtime can be changed to an absolute value:
|
* The mtime can be changed to an absolute value:
|
||||||
|
Loading…
Reference in New Issue
Block a user