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	add macro REALLOC_ARRAY	2014-09-18 09:13:38 -07:00
api-argv-array.txt	argv-array: implement argv_array_pushv()	2015-06-15 12:40:49 -07:00
api-builtin.txt
api-config.txt	Merge branch 'ta/config-set-1'	2014-09-11 10:33:25 -07:00
api-credentials.txt	credential: let helpers tell us to quit	2014-12-04 10:11:12 -08:00
api-decorate.txt
api-diff.txt
api-directory-listing.txt
api-error-handling.txt	api-error-handling doc: typofix	2015-03-28 09:24:55 -07:00
api-gitattributes.txt
api-grep.txt
api-hashmap.txt	hashmap: add string interning API	2014-07-07 13:56:38 -07:00
api-history-graph.txt
api-in-core-index.txt
api-index-skel.txt
api-index.sh
api-lockfile.txt	fdopen_lock_file(): access a lockfile using stdio	2014-10-01 14:08:10 -07:00
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	each_ref_fn: change to take an object_id parameter	2015-05-25 12:19:27 -07:00
api-remote.txt	remote.c: drop "remote" pointer from "struct branch"	2015-05-21 10:48:10 -07:00
api-revision-walking.txt
api-run-command.txt	Merge branch 'rs/child-process-init'	2014-10-31 11:49:49 -07:00
api-setup.txt
api-sha1-array.txt
api-sigchain.txt
api-string-list.txt	sort_string_list(): rename to string_list_sort()	2014-11-25 10:11:34 -08:00
api-trace.txt	api-trace.txt: add trace API documentation	2014-07-13 21:25:21 -07:00
api-tree-walking.txt
api-xdiff-interface.txt
bitmap-format.txt
http-protocol.txt	upload-pack: optionally allow fetching reachable sha1	2015-05-22 18:25:36 -07:00
index-format.txt	untracked cache: guard and disable on system changes	2015-03-12 13:45:18 -07:00
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	upload-pack: optionally allow fetching reachable sha1	2015-05-22 18:25:36 -07:00
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