git/builtin/pull.c, branch v2.19.2

Merge branch 'rs/opt-updates'

2018-08-27T21:33:43Z

"git cmd -h" updates. * rs/opt-updates: parseopt: group literal string alternatives in argument help remote: improve argument help for add --mirror checkout-index: improve argument help for --stage

parseopt: group literal string alternatives in argument help

2018-08-21T18:35:54Z

This formally clarifies that the "--option=" part is the same for all alternatives. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'js/pull-rebase-type-shorthand'

2018-08-17T20:09:59Z

"git pull --rebase=interactive" learned "i" as a short-hand for "interactive". * js/pull-rebase-type-shorthand: pull --rebase=: allow single-letter abbreviations for the type

pull --rebase=: allow single-letter abbreviations for the type

2018-08-06T20:04:28Z

Git for Windows' original 4aa8b8c8283 (Teach 'git pull' to handle --rebase=interactive, 2011-10-21) had support for the very convenient abbreviation git pull --rebase=i which was later lost when it was ported to the builtin `git pull`, and it was not introduced before the patch eventually made it into Git as f5eb87b98dd (pull: allow interactive rebase with --rebase=interactive, 2016-01-13). However, it is *really* a useful short hand for the occasional rebasing pull on branches that do not usually want to be rebased. So let's reintroduce this convenience, at long last. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

commit: add repository argument to lookup_commit_reference

2018-06-29T17:43:39Z

Add a repository argument to allow callers of lookup_commit_reference to be more specific about which repository to handle. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'sb/object-store-grafts' into sb/object-store-lookup

2018-06-29T17:43:28Z

* sb/object-store-grafts: commit: allow lookup_commit_graft to handle arbitrary repositories commit: allow prepare_commit_graft to handle arbitrary repositories shallow: migrate shallow information into the object parser path.c: migrate global git_path_* to take a repository argument cache: convert get_graft_file to handle arbitrary repositories commit: convert read_graft_file to handle arbitrary repositories commit: convert register_commit_graft to handle arbitrary repositories commit: convert commit_graft_pos() to handle arbitrary repositories shallow: add repository argument to is_repository_shallow shallow: add repository argument to check_shallow_file_for_update shallow: add repository argument to register_shallow shallow: add repository argument to set_alternate_shallow_file commit: add repository argument to lookup_commit_graft commit: add repository argument to prepare_commit_graft commit: add repository argument to read_graft_file commit: add repository argument to register_commit_graft commit: add repository argument to commit_graft_pos object: move grafts to object parser object-store: move object access functions to object-store.h

Merge branch 'ab/refspec-init-fix'

2018-06-28T19:53:29Z

Make refspec parsing codepath more robust. * ab/refspec-init-fix: refspec: initalize `refspec_item` in `valid_fetch_refspec()` refspec: add back a refspec_item_init() function refspec: s/refspec_item_init/&_or_die/g

Merge branch 'rd/doc-remote-tracking-with-hyphen'

2018-06-18T17:18:43Z

Doc update. * rd/doc-remote-tracking-with-hyphen: Use hyphenated "remote-tracking branch" (docs and comments)

Use hyphenated "remote-tracking branch" (docs and comments)

2018-06-13T16:57:09Z

Use the obvious consensus of hyphenated "remote-tracking branch", and fix an obvious typo, all in documentation and comments. Signed-off-by: Robert P. J. Day Signed-off-by: Junio C Hamano

refspec: s/refspec_item_init/&_or_die/g

2018-06-11T17:11:29Z

Rename the refspec_item_init() function introduced in 6d4c057859 ("refspec: introduce struct refspec", 2018-05-16) to refspec_item_init_or_die(). This follows the convention of other *_or_die() functions, and is done in preparation for making it a wrapper for a non-fatal variant. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano