summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-2612-38/+115
|\
| * glossary: define 'stash entry'lb/status-stash-countLiam Beguin2017-06-181-0/+4
| * status: add optional stash count informationLiam Beguin2017-06-186-0/+71
| * stash: update documentation to use 'stash entry'Liam Beguin2017-06-186-38/+40
* | Sync with 2.13.2Junio C Hamano2017-06-242-12/+17
|\ \
| * | Git 2.13.2v2.13.2Junio C Hamano2017-06-242-1/+18
| * | Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano2017-06-241-1/+1
| |\ \
| * \ \ Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano2017-06-241-2/+2
| |\ \ \
| * \ \ \ Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano2017-06-241-0/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'sg/revision-parser-skip-prefix' into maintJunio C Hamano2017-06-242-48/+44
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano2017-06-241-0/+42
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano2017-06-241-4/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano2017-06-241-3/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2017-06-242-0/+19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ls/github' into maintJunio C Hamano2017-06-242-0/+26
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2017-06-241-1/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-blob' into maintJunio C Hamano2017-06-2410-147/+301
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2017-06-242-8/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Eleventh batch for 2.14Junio C Hamano2017-06-241-15/+46
* | | | | | | | | | | | | | | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-2449-195/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | *.[ch] refactoring: make use of the FREE_AND_NULL() macroÆvar Arnfjörð Bjarmason2017-06-1612-49/+23
| * | | | | | | | | | | | | | | coccinelle: make use of the "expression" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-162-4/+2
| * | | | | | | | | | | | | | | coccinelle: add a rule to make "expression" code use FREE_AND_NULL()Ævar Arnfjörð Bjarmason2017-06-161-0/+7
| * | | | | | | | | | | | | | | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-1637-142/+71
| * | | | | | | | | | | | | | | coccinelle: add a rule to make "type" code use FREE_AND_NULL()Ævar Arnfjörð Bjarmason2017-06-161-0/+8
| * | | | | | | | | | | | | | | git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULLÆvar Arnfjörð Bjarmason2017-06-151-0/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/warn-add-gitlink'Junio C Hamano2017-06-2410-12/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t: move "git add submodule" into test blocksjk/warn-add-gitlinkJeff King2017-06-153-9/+15
| * | | | | | | | | | | | | | | add: warn when adding an embedded repositoryJeff King2017-06-157-3/+98
* | | | | | | | | | | | | | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24147-229/+397
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | config: don't implicitly use gitdir or commondirbw/config-hBrandon Williams2017-06-153-24/+29
| * | | | | | | | | | | | | | | | config: respect commondirBrandon Williams2017-06-152-4/+8
| * | | | | | | | | | | | | | | | setup: teach discover_git_directory to respect the commondirBrandon Williams2017-06-153-16/+26
| * | | | | | | | | | | | | | | | config: don't include config.h by defaultBrandon Williams2017-06-15146-1/+145
| * | | | | | | | | | | | | | | | config: remove git_config_iterBrandon Williams2017-06-151-1/+0
| * | | | | | | | | | | | | | | | config: create config.hBrandon Williams2017-06-152-189/+195
* | | | | | | | | | | | | | | | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-2415-123/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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
View Lorry Controller Status