summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* clone: pass --progress decision to recursive submodulesjk/clone-recursive-progressJeff King2016-09-223-5/+34
* Merge branch 'sb/submodule-clone-rr'Junio C Hamano2016-09-088-121/+379
|\
| * clone: recursive and reference option triggers submodule alternatessb/submodule-clone-rrStefan Beller2016-08-174-0/+176
| * clone: implement optional referencesStefan Beller2016-08-152-11/+29
| * clone: clarify option_reference as requiredStefan Beller2016-08-151-4/+4
| * clone: factor out checking for an alternate pathStefan Beller2016-08-153-34/+86
| * submodule--helper update-clone: allow multiple referencesStefan Beller2016-08-122-6/+10
| * submodule--helper module-clone: allow multiple referencesStefan Beller2016-08-121-8/+12
| * t7408: merge short tests, factor out testing methodStefan Beller2016-08-121-23/+25
| * t7408: modernize styleStefan Beller2016-08-121-69/+71
* | Merge branch 'jh/status-v2-porcelain'Junio C Hamano2016-09-087-112/+1306
|\ \
| * | status: unit tests for --porcelain=v2jh/status-v2-porcelainJeff Hostetler2016-08-121-0/+593
| * | test-lib-functions.sh: add lf_to_nul helperJeff Hostetler2016-08-111-0/+4
| * | git-status.txt: describe --porcelain=v2 formatJeff Hostetler2016-08-111-4/+122
| * | status: print branch info with --porcelain=v2 --branchJeff Hostetler2016-08-113-0/+96
| * | status: print per-file porcelain v2 status dataJeff Hostetler2016-08-111-1/+284
| * | status: collect per-file data for --porcelain=v2Jeff Hostetler2016-08-113-2/+69
| * | status: support --porcelain[=<version>]Jeff Hostetler2016-08-053-5/+44
| * | status: cleanup API to wt_status_printJeff Hostetler2016-08-053-49/+43
| * | status: rename long-format print routinesJeff Hostetler2016-08-053-58/+58
* | | Merge branch 'po/range-doc'Junio C Hamano2016-09-085-51/+88
|\ \ \
| * | | doc: revisions: sort examples and fix alignment of the unchangedpo/range-docPhilip Oakley2016-08-131-6/+6
| * | | doc: revisions: show revision expansion in examplesPhilip Oakley2016-08-131-6/+17
| * | | doc: revisions - clarify reachability examplesPhilip Oakley2016-08-131-5/+6
| * | | doc: revisions - define `reachable`Philip Oakley2016-08-131-4/+10
| * | | doc: gitrevisions - clarify 'latter case' is revision walkPhilip Oakley2016-08-131-2/+2
| * | | doc: gitrevisions - use 'reachable' in page descriptionPhilip Oakley2016-08-131-2/+2
| * | | doc: revisions: single vs multi-parent notation comparisonPhilip Oakley2016-08-131-0/+4
| * | | doc: revisions: extra clarification of <rev>^! notation effectsPhilip Oakley2016-08-131-1/+2
| * | | doc: revisions: give headings for the two and three dot notationsPhilip Oakley2016-08-121-22/+36
| * | | doc: show the actual left, right, and boundary marksPhilip Oakley2016-07-201-1/+1
| * | | doc: revisions - name the left and right sidesPhilip Oakley2016-07-201-1/+1
| * | | doc: use 'symmetric difference' consistentlyPhilip Oakley2016-07-202-3/+3
* | | | Merge branch 'rt/help-unknown'Junio C Hamano2016-09-083-8/+89
|\ \ \ \
| * | | | help: make option --help open man pages only for Git commandsrt/help-unknownRalf Thielow2016-08-302-1/+22
| * | | | help: introduce option --exclude-guidesRalf Thielow2016-08-302-7/+67
| * | | | Merge branch 'js/no-html-bypass-on-windows' into rt/help-unknownJunio C Hamano2016-08-263-52/+0
| |\ \ \ \
* | \ \ \ \ Merge branch 'cc/receive-pack-limit'Junio C Hamano2016-09-088-0/+93
|\ \ \ \ \ \
| * | | | | | receive-pack: allow a maximum input size to be specifiedcc/receive-pack-limitJeff King2016-08-244-0/+76
| * | | | | | unpack-objects: add --max-input-size=<size> optionChristian Couder2016-08-242-0/+10
| * | | | | | index-pack: add --max-input-size=<size> optionJeff King2016-08-242-0/+7
* | | | | | | Merge branch 'jk/format-patch-number-singleton-patch-with-cover'Junio C Hamano2016-09-082-4/+21
|\ \ \ \ \ \ \
| * | | | | | | format-patch: show 0/1 and 1/1 for singleton patch with cover letterjk/format-patch-number-singleton-patch-with-coverJacob Keller2016-08-232-4/+21
* | | | | | | | Merge branch 'jk/delta-base-cache'Junio C Hamano2016-09-082-73/+111
|\ \ \ \ \ \ \ \
| * | | | | | | | t/perf: add basic perf tests for delta base cacheJeff King2016-08-231-0/+31
| * | | | | | | | delta_base_cache: use hashmap.hJeff King2016-08-231-34/+60
| * | | | | | | | delta_base_cache: drop special treatment of blobsJeff King2016-08-231-8/+0
| * | | | | | | | delta_base_cache: use list.h for LRUJeff King2016-08-231-22/+16
| * | | | | | | | release_delta_base_cache: reuse existing detach functionJeff King2016-08-231-4/+1
| * | | | | | | | clear_delta_base_cache_entry: use a more descriptive nameJeff King2016-08-231-2/+7