summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | sha1_file: add for_each iterators for loose and packed objectsJeff King2014-10-162-0/+73
| * | | | | | | | | | | | | | | | | | | | | | | count-objects: use for_each_loose_file_in_objdirJeff King2014-10-161-71/+30
| * | | | | | | | | | | | | | | | | | | | | | | count-objects: do not use xsize_t when counting object sizeJeff King2014-10-161-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | prune-packed: use for_each_loose_file_in_objdirJeff King2014-10-161-46/+23
| * | | | | | | | | | | | | | | | | | | | | | | reachable: mark index blobs as SEENJeff King2014-10-161-1/+6
| * | | | | | | | | | | | | | | | | | | | | | | prune: factor out loose-object directory traversalJeff King2014-10-163-61/+143
| * | | | | | | | | | | | | | | | | | | | | | | reachable: reuse revision.c "add all reflogs" codeJeff King2014-10-163-25/+4
| * | | | | | | | | | | | | | | | | | | | | | | reachable: use traverse_commit_list instead of custom walkJeff King2014-10-161-113/+17
| * | | | | | | | | | | | | | | | | | | | | | | clean up name allocation in prepare_revision_walkJeff King2014-10-161-7/+7
| * | | | | | | | | | | | | | | | | | | | | | | object_array: add a "clear" functionJeff King2014-10-163-6/+17
| * | | | | | | | | | | | | | | | | | | | | | | object_array: factor out slopbuf-freeing logicJeff King2014-10-161-4/+12
| * | | | | | | | | | | | | | | | | | | | | | | isxdigit: cast input to unsigned charJeff King2014-10-162-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | foreach_alt_odb: propagate return value from callbackJeff King2014-10-162-5/+9
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/asciidoctor'Junio C Hamano2014-10-291-11/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: remove Asciidoctor linkgit macrobc/asciidoctorbrian m. carlson2014-10-271-39/+0
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: refactor common operations into variablesbrian m. carlson2014-10-271-11/+11
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: implement linkgit macro for Asciidoctorbrian m. carlson2014-10-151-0/+39
| * | | | | | | | | | | | | | | | | | | | | | | Documentation: move some AsciiDoc parameters into variablesbrian m. carlson2014-10-151-7/+11
* | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-10-241-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2014-10-242-1/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | push: heed user.signingkey for signed pushesMichael J Gruber2014-10-242-1/+56
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/plug-transport-leak'Junio C Hamano2014-10-242-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | .mailmap: add Stefan Bellers corporate mail addresssb/plug-transport-leakStefan Beller2014-10-211-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | transport: free leaking head in transport_print_push_status()Stefan Beller2014-10-211-0/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/dir-prep-exclude-cleanup'Junio C Hamano2014-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | dir.c: remove the second declaration of "stk" in prep_exclude()nd/dir-prep-exclude-cleanupNguyễn Thái Ngọc Duy2014-10-211-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'eb/no-pthreads'Junio C Hamano2014-10-247-12/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Handle atexit list internaly for unthreaded buildseb/no-pthreadsEtienne Buira2014-10-194-10/+47
| * | | | | | | | | | | | | | | | | | | | | | | pack-objects: set number of threads before checking and warningJunio C Hamano2014-10-132-2/+8
| * | | | | | | | | | | | | | | | | | | | | | | index-pack: fix compilation with NO_PTHREADSEtienne Buira2014-10-131-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'wk/t1304-wo-USER'Junio C Hamano2014-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t1304: Set LOGNAME even if USER is unset or nullwk/t1304-wo-USERW. Trevor King2014-10-191-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/core-filemode-doc'Junio C Hamano2014-10-241-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | core.filemode may need manual actiontb/core-filemode-docTorsten Bögershausen2014-10-191-6/+19
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/run-command-env-array'Junio C Hamano2014-10-248-39/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | use env_array member of struct child_processrs/run-command-env-arrayRené Scharfe2014-10-195-38/+25
| * | | | | | | | | | | | | | | | | | | | | | | | run-command: add env_array, an optional argv_array for envRené Scharfe2014-10-193-1/+13
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'po/doc-status-markup'Junio C Hamano2014-10-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | doc: fix 'git status --help' character quotingpo/doc-status-markupPhilip Oakley2014-10-191-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Junio C Hamano2014-10-242-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | pack-objects: turn off bitmaps when we split packsjk/pack-objects-no-bitmap-when-splittingJeff King2014-10-192-0/+10
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 2.2Junio C Hamano2014-10-211-4/+17
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/completion-hide-not-a-repo'Junio C Hamano2014-10-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | completion: silence "fatal: Not a git repository" errorjs/completion-hide-not-a-repoJohn Szakmeister2014-10-141-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/mergetool-meld'Junio C Hamano2014-10-212-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | mergetools/meld: make usage of `--output` configurable and more robustda/mergetool-meldDavid Aguilar2014-10-162-2/+16
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-213-4/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t7610-mergetool: add test cases for mergetool.writeToTempda/mergetool-temporary-directoryDavid Aguilar2014-10-161-0/+23
| * | | | | | | | | | | | | | | | | | | | | | | | mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-162-4/+37
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/mergetool-tool-help'Junio C Hamano2014-10-214-14/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \