Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.6.2 2015-10-16T21:32:32Z 2015-10-16T21:32:32Z Junio C Hamano gitster@pobox.com 2015-10-16T21:32:32Z urn:sha1:c7997e54a5dd75803657b25aea101255f388ac08 * pt/pull-builtin: pull: enclose <options> in brackets in the usage string merge: grammofix in please-commit-before-merge message 2015-10-02T21:29:56Z Alex Henrie alexhenrie24@gmail.com 2015-10-02T04:25:33Z urn:sha1:b7447679e84ed973430ab19fce87f56857b83068 Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2015-08-25T23:09:30Z Junio C Hamano gitster@pobox.com 2015-08-25T23:09:30Z urn:sha1:33f2c4ff7b9ac02cd9010d504e847b912b35baf6 * maint: pull: pass upload_pack only when it was given 2015-08-19T21:48:51Z Junio C Hamano gitster@pobox.com 2015-08-19T21:48:51Z urn:sha1:d772def9c835a9521bfa9221a3e39feaf9a7b416 "git pull" in recent releases of Git has a regression in the code that allows custom path to the --upload-pack=<program>. This has been corrected. Note that this is irrelevant for 'master' with "git pull" rewritten in C. * mm/pull-upload-pack: pull.sh: quote $upload_pack when passing it to git-fetch 2015-08-03T18:01:17Z Junio C Hamano gitster@pobox.com 2015-08-03T18:01:17Z urn:sha1:5f02274e4c4506b923b510a24da7991656f4db14 Reimplement 'git pull' in C. * pt/pull-builtin: pull: remove redirection to git-pull.sh pull --rebase: error on no merge candidate cases pull --rebase: exit early when the working directory is dirty pull: configure --rebase via branch.<name>.rebase or pull.rebase pull: teach git pull about --rebase pull: set reflog message pull: implement pulling into an unborn branch pull: fast-forward working tree if head is updated pull: check if in unresolved merge state pull: support pull.ff config pull: error on no merge candidates pull: pass git-fetch's options to git-fetch pull: pass git-merge's options to git-merge pull: pass verbosity, --progress flags to fetch and merge pull: implement fetch + merge pull: implement skeletal builtin pull argv-array: implement argv_array_pushv() parse-options-cb: implement parse_opt_passthru_argv() parse-options-cb: implement parse_opt_passthru() 2015-06-18T20:18:59Z Paul Tan pyokagan@gmail.com 2015-06-18T10:54:12Z urn:sha1:b1456605c26eb6bd991b70b0ca0a3ce0f02473e9 At the beginning of the rewrite of git-pull.sh to C, we introduced a redirection to git-pull.sh if the environment variable _GIT_USE_BUILTIN_PULL was not defined in order to not break test scripts that relied on a functional git-pull. Now that all of git-pull's functionality has been re-implemented in builtin/pull.c, remove this redirection, and retire the old git-pull.sh into contrib/examples/. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>