OPT_FILENAME is used to prefix filenames given on the command line, so that they are relative to the current working directory. For a more in-depth description see the fourth patch. This series is really two parts, two bug fixes and the introduction of OPT_FILNAME, but they're all related to one commit dbd0f5c (Files given on the command line are relative to $cwd, 2008-08-06). It touches a lot of files, but that's mostly because of patch three. Stephen Boyd (4): commit: -F overrides -t apply, fmt-merge-msg: use relative filenames parse-opts: prepare for OPT_FILENAME parse-opts: add OPT_FILENAME and transition builtins Documentation/technical/api-parse-options.txt | 9 ++++- archive.c | 2 +- builtin-add.c | 2 +- builtin-apply.c | 5 ++- builtin-archive.c | 3 +- builtin-bisect--helper.c | 3 +- builtin-blame.c | 2 +- builtin-branch.c | 3 +- builtin-cat-file.c | 2 +- builtin-check-attr.c | 4 +- builtin-checkout-index.c | 2 +- builtin-checkout.c | 2 +- builtin-clean.c | 3 +- builtin-clone.c | 2 +- builtin-commit.c | 9 ++--- builtin-config.c | 3 +- builtin-count-objects.c | 2 +- builtin-describe.c | 2 +- builtin-fast-export.c | 2 +- builtin-fetch.c | 2 +- builtin-fmt-merge-msg.c | 5 ++- builtin-for-each-ref.c | 2 +- builtin-fsck.c | 2 +- builtin-gc.c | 3 +- builtin-grep.c | 2 +- builtin-help.c | 2 +- builtin-ls-files.c | 2 +- builtin-merge-base.c | 2 +- builtin-merge-file.c | 2 +- builtin-merge.c | 4 +- builtin-mv.c | 3 +- builtin-name-rev.c | 2 +- builtin-pack-refs.c | 2 +- builtin-prune.c | 2 +- builtin-push.c | 2 +- builtin-remote.c | 16 +++++--- builtin-reset.c | 2 +- builtin-rev-parse.c | 4 +- builtin-revert.c | 2 +- builtin-rm.c | 3 +- builtin-shortlog.c | 2 +- builtin-symbolic-ref.c | 3 +- builtin-tag.c | 5 +-- builtin-update-ref.c | 3 +- hash-object.c | 3 +- parse-options.c | 47 ++++++++++++++++-------- parse-options.h | 11 ++++-- t/t0040-parse-options.sh | 19 +++++++++- t/t4131-apply-fake-ancestor.sh | 42 ++++++++++++++++++++++ t/t6200-fmt-merge-msg.sh | 32 +++++++++++++++++ t/t7500-commit.sh | 10 +++++ test-parse-options.c | 6 +++- 52 files changed, 226 insertions(+), 85 deletions(-) create mode 100755 t/t4131-apply-fake-ancestor.sh -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html