diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:52 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 00:59:52 (GMT) |
commit | 54b469b9e9a9f276a5980265cd2abeb003cb6bf3 (patch) | |
tree | 3f49a8bb58e9a36a00a3556990ae9e39e0815eaf /Documentation | |
parent | 7d0c1f4556ad89b2f7eae97d31ea85c3bfdf7c87 (diff) | |
parent | ed88148674502893790bf13d70154c157a489a6b (diff) | |
download | git-54b469b9e9a9f276a5980265cd2abeb003cb6bf3.zip git-54b469b9e9a9f276a5980265cd2abeb003cb6bf3.tar.gz git-54b469b9e9a9f276a5980265cd2abeb003cb6bf3.tar.bz2 |
Merge branch 'nd/diff-parseopt'
The diff machinery, one of the oldest parts of the system, which
long predates the parse-options API, uses fairly long and complex
handcrafted option parser. This is being rewritten to use the
parse-options API.
* nd/diff-parseopt:
diff.c: convert --raw
diff.c: convert -W|--[no-]function-context
diff.c: convert -U|--unified
diff.c: convert -u|-p|--patch
diff.c: prepare to use parse_options() for parsing
diff.h: avoid bit fields in struct diff_flags
diff.h: keep forward struct declarations sorted
parse-options: allow ll_callback with OPTION_CALLBACK
parse-options: avoid magic return codes
parse-options: stop abusing 'callback' for lowlevel callbacks
parse-options: add OPT_BITOP()
parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
parse-options: add one-shot mode
parse-options.h: remove extern on function prototypes
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/diff-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 554a340..f373741 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -36,7 +36,7 @@ endif::git-format-patch[] -U<n>:: --unified=<n>:: Generate diffs with <n> lines of context instead of - the usual three. + the usual three. Implies `--patch`. ifndef::git-format-patch[] Implies `-p`. endif::git-format-patch[] |