Junio C Hamano 5f02274e4c Merge branch 'pt/pull-builtin' ... 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-08-03 11:01:17 -07:00
..
.gitignore
api-allocation-growing.txt
api-argv-array.txt	argv-array: implement argv_array_pushv()	2015-06-15 12:40:49 -07:00
api-builtin.txt
api-config.txt
api-credentials.txt
api-decorate.txt
api-diff.txt
api-directory-listing.txt
api-error-handling.txt
api-gitattributes.txt
api-grep.txt
api-hashmap.txt
api-history-graph.txt
api-in-core-index.txt
api-index-skel.txt
api-index.sh
api-lockfile.txt
api-merge.txt
api-object-access.txt
api-parse-options.txt	Merge branch 'pt/pull-builtin'	2015-08-03 11:01:17 -07:00
api-quote.txt
api-ref-iteration.txt
api-remote.txt
api-revision-walking.txt
api-run-command.txt
api-setup.txt
api-sha1-array.txt
api-sigchain.txt
api-string-list.txt
api-trace.txt
api-tree-walking.txt
api-xdiff-interface.txt
bitmap-format.txt
http-protocol.txt
index-format.txt
pack-format.txt
pack-heuristics.txt
pack-protocol.txt	Merge branch 'sb/pack-protocol-mention-smart-http'	2015-06-16 14:27:08 -07:00
protocol-capabilities.txt
protocol-common.txt
racy-git.txt	Makefile / racy-git.txt: clarify USE_NSEC prerequisites	2015-07-01 14:54:42 -07:00
send-pack-pipeline.txt
shallow.txt
trivial-merge.txt