summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bundle: split out ref writing from bundle_creaters/use-child-process-init-moreJeff King2014-10-301-39/+58
* bundle: split out a helper function to compute and write prerequisitesJunio C Hamano2014-10-301-24/+35
* bundle: split out a helper function to create pack dataJunio C Hamano2014-10-301-27/+37
* use child_process_init() to initialize struct child_process variablesRené Scharfe2014-10-284-4/+4
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: don't assume that default sh is saneda/mergetool-tool-helpCharles Bailey2014-10-152-5/+5
| * | | | | | | | mergetool: don't require a work tree for --tool-helpCharles Bailey2014-10-151-1/+4
| * | | | | | | | git-sh-setup: move GIT_DIR initialization into a functionDavid Aguilar2014-10-151-2/+6
| * | | | | | | | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-151-5/+11
| * | | | | | | | test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar2014-10-151-12/+18
| * | | | | | | | t7610-mergetool: prefer test_config over git configDavid Aguilar2014-10-151-11/+9
* | | | | | | | | Merge branch 'da/mergetool-temporary-filename'Junio C Hamano2014-10-211-5/+11
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | mergetool: use more conservative temporary filenamesda/mergetool-temporary-filenameDavid Aguilar2014-10-161-5/+11
* | | | | | | | | Merge branch 'da/mergetool-tests'Junio C Hamano2014-10-212-471/+469
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | test-lib-functions: adjust style to match CodingGuidelinesda/mergetool-testsDavid Aguilar2014-10-161-12/+18
| * | | | | | | | t7610-mergetool: use test_config to isolate testsDavid Aguilar2014-10-161-5/+3
| |/ / / / / / /
| * | | | | | | t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar2014-10-151-8/+2
| * | | | | | | t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar2014-10-151-459/+459
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-2145-350/+849
|\ \ \ \ \ \ \
View Lorry Controller Status