summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ls-files: factor out tag calculationbw/ls-files-sans-the-indexBrandon Williams2017-06-131-16/+25
* ls-files: factor out debug info into a functionBrandon Williams2017-06-131-9/+14
* ls-files: convert show_files to take an indexBrandon Williams2017-06-131-15/+15
* ls-files: convert show_ce_entry to take an indexBrandon Williams2017-06-131-5/+6
* ls-files: convert prune_cache to take an indexBrandon Williams2017-06-131-7/+8
* ls-files: convert ce_excluded to take an indexBrandon Williams2017-06-131-4/+5
* ls-files: convert show_ru_info to take an indexBrandon Williams2017-06-131-4/+4
* ls-files: convert show_other_files to take an indexBrandon Williams2017-06-131-3/+4
* ls-files: convert show_killed_files to take an indexBrandon Williams2017-06-131-10/+11
* ls-files: convert write_eolinfo to take an indexBrandon Williams2017-06-131-7/+6
* ls-files: convert overlay_tree_on_cache to take an indexBrandon Williams2017-06-133-9/+12
* tree: convert read_tree to take an index parameterBrandon Williams2017-06-133-12/+21
* convert: convert renormalize_buffer to take an indexBrandon Williams2017-06-134-6/+9
* convert: convert convert_to_git to take an indexBrandon Williams2017-06-138-15/+18
* convert: convert convert_to_git_filter_fd to take an indexBrandon Williams2017-06-133-4/+6
* convert: convert crlf_to_git to take an indexBrandon Williams2017-06-131-6/+8
* convert: convert get_cached_convert_stats_ascii to take an indexBrandon Williams2017-06-133-4/+9
* Merge branch 'master' of git://bogomips.org/git-svnJunio C Hamano2017-06-101-0/+16
|\
| * doc: describe git svn init --ignore-refsAndreas Heiduk2017-06-071-0/+16
|/
* Sync with maintJunio C Hamano2017-06-073-9/+28
|\
| * Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano2017-06-073-9/+28
| |\
| | * sha1dc: update from upstreamÆvar Arnfjörð Bjarmason2017-06-072-9/+27
| | * sha1dc: ignore indent-with-non-tab whitespace violationsJeff King2017-06-071-0/+1
* | | Sync with v2.13.1Junio C Hamano2017-06-052-510/+45
|\ \ \ | |/ /
| * | Git 2.13.1v2.13.1Junio C Hamano2017-06-053-511/+46
| * | Merge branch 'ah/doc-rev-parse-short-default' into maintJunio C Hamano2017-06-052-6/+7
| |\ \
| * \ \ Merge branch 'ah/doc-filter-branch-export-env' into maintJunio C Hamano2017-06-051-4/+1
| |\ \ \
| * \ \ \ Merge branch 'sd/t3200-typofix' into maintJunio C Hamano2017-06-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'sb/t5531-update-desc' into maintJunio C Hamano2017-06-051-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ah/doc-pretty-format-fix' into maintJunio C Hamano2017-06-051-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ah/doc-interpret-trailers-ifexists' into maintJunio C Hamano2017-06-051-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ab/ref-filter-no-contains' into maintJunio C Hamano2017-06-051-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sg/core-filemode-doc-typofix' into maintJunio C Hamano2017-06-051-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tb/dedup-crlf-tests' into maintJunio C Hamano2017-06-052-187/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/credential-doc-on-clear' into maintJunio C Hamano2017-06-051-10/+10
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/url-insteadof-config' into maintJunio C Hamano2017-06-052-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/unbreak-am-h' into maintJunio C Hamano2017-06-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano2017-06-057-88/+172
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'js/bs-is-a-dir-sep-on-windows' into maintJunio C Hamano2017-06-052-2/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/alternate-ref-optim' into maintJunio C Hamano2017-06-051-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano2017-06-055-13/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano2017-06-051-7/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/checkout-am-fix-unborn' into maintJunio C Hamano2017-06-052-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jn/clone-add-empty-config-from-command-line' into maintJunio C Hamano2017-06-052-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/c-translators-comment-style' into maintJunio C Hamano2017-06-059-26/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-doc-asciidoctor' into maintJunio C Hamano2017-06-052-4/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | Seventh batch for 2.14Junio C Hamano2017-06-051-43/+28
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ad/pull-remote-doc'Junio C Hamano2017-06-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | docs: fix formatting and grammarad/pull-remote-docAdam Dinwoodie2017-06-021-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano2017-06-052-11/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status