mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/nor-or-nand-and' into maint

Browse Source 
* 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:
Junio C Hamano
2014-04-09 12:03:26 -07:00
parent fbae3d9ace 235e8d5914
commit 3c9e56b75c
57 changed files with 88 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -1121,7 +1121,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
if (argc == 0 && only && amend)
only_include_assumed = _("Clever... amending the last one with dirty index.");
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"))
cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
else if (!strcmp(cleanup_arg, "verbatim"))