git/Documentation/technical, branch v2.1.2

Merge branch 'sp/pack-protocol-doc-on-shallow' into maint

2014-09-19T21:05:11Z

* sp/pack-protocol-doc-on-shallow: Document LF appearing in shallow command during send-pack/receive-pack

Document LF appearing in shallow command during send-pack/receive-pack

2014-08-28T22:13:55Z

The implementation sends an LF, but the protocol documentation was missing this detail. Signed-off-by: Shawn Pearce Signed-off-by: Junio C Hamano

Merge branch 'ta/doc-config'

2014-08-04T21:03:25Z

* ta/doc-config: add documentation for writing config files

add documentation for writing config files

2014-07-30T19:16:07Z

Replace TODO introduced in commit 9c3c22 with documentation explaining Git config API functions for writing configuration files. Signed-off-by: Tanay Abhra Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'ta/string-list-init'

2014-07-23T18:35:54Z

* ta/string-list-init: replace memset with string-list initializers string-list: add string_list initializer helper function

Merge branch 'kb/perf-trace'

2014-07-22T17:59:19Z

* kb/perf-trace: api-trace.txt: add trace API documentation progress: simplify performance measurement by using getnanotime() wt-status: simplify performance measurement by using getnanotime() git: add performance tracing for git's main() function to debug scripts trace: add trace_performance facility to debug performance issues trace: add high resolution timer function to debug performance issues trace: add 'file:line' to all trace output trace: move code around, in preparation to file:line output trace: add current timestamp to all trace output trace: disable additional trace output for unit tests trace: add infrastructure to augment trace output with additional info sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace API Documentation/git.txt: improve documentation of 'GIT_TRACE*' variables trace: improve trace performance trace: remove redundant printf format attribute trace: consistently name the format parameter trace: move trace declarations from cache.h to new trace.h

Merge branch 'ye/doc-http-proto' into maint

2014-07-22T17:28:02Z

* ye/doc-http-proto: http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616

Merge branch 'kb/hashmap-updates'

2014-07-21T18:18:44Z

* kb/hashmap-updates: hashmap: add string interning API hashmap: add simplified hashmap_get_from_hash() API hashmap: improve struct hashmap member documentation hashmap: factor out getting a hash code from a SHA1

string-list: add string_list initializer helper function

2014-07-21T17:23:36Z

The string-list API has STRING_LIST_INIT_* macros to be used to define variables with initializers, but lacks functions to initialize an uninitialized piece of memory to be used as a string-list at the run-time. Introduce `string_list_init()` function for that. Signed-off-by: Tanay Abhra Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'nd/split-index'

2014-07-16T18:25:40Z

An experiment to use two files (the base file and incremental changes relative to it) to represent the index to reduce I/O cost of rewriting a large index when only small part of the working tree changes. * nd/split-index: (32 commits) t1700: new tests for split-index mode t2104: make sure split index mode is off for the version test read-cache: force split index mode with GIT_TEST_SPLIT_INDEX read-tree: note about dropping split-index mode or index version read-tree: force split-index mode off on --index-output rev-parse: add --shared-index-path to get shared index path update-index --split-index: do not split if $GIT_DIR is read only update-index: new options to enable/disable split index mode split-index: strip pathname of on-disk replaced entries split-index: do not invalidate cache-tree at read time split-index: the reading part split-index: the writing part read-cache: mark updated entries for split index read-cache: save deleted entries in split index read-cache: mark new entries for split index read-cache: split-index mode read-cache: save index SHA-1 after reading entry.c: update cache_changed if refresh_cache is set in checkout_entry() cache-tree: mark istate->cache_changed on prime_cache_tree() cache-tree: mark istate->cache_changed on cache tree update ...