aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* git-svn: cache only mergeinfo revisionsEric Wong2014-10-24
* git-svn: reduce check_cherry_pick cache overheadEric Wong2014-10-24
* git-svn: only look at the root path for svn:mergeinfoJakob Stoklund Olesen2014-10-24
* git-svn: only look at the new parts of svn:mergeinfoJakob Stoklund Olesen2014-10-24
* Update draft release notes to 2.2Junio C Hamano2014-10-24
* Merge branch 'jc/push-cert'Junio C Hamano2014-10-24
|\
| * push: heed user.signingkey for signed pushesMichael J Gruber2014-10-24
* | Merge branch 'sb/plug-transport-leak'Junio C Hamano2014-10-24
|\ \
| * | .mailmap: add Stefan Bellers corporate mail addressStefan Beller2014-10-21
| * | transport: free leaking head in transport_print_push_status()Stefan Beller2014-10-21
* | | Merge branch 'nd/dir-prep-exclude-cleanup'Junio C Hamano2014-10-24
|\ \ \
| * | | dir.c: remove the second declaration of "stk" in prep_exclude()Nguyễn Thái Ngọc Duy2014-10-21
* | | | Merge branch 'eb/no-pthreads'Junio C Hamano2014-10-24
|\ \ \ \
| * | | | Handle atexit list internaly for unthreaded buildsEtienne Buira2014-10-19
| * | | | pack-objects: set number of threads before checking and warningJunio C Hamano2014-10-13
| * | | | index-pack: fix compilation with NO_PTHREADSEtienne Buira2014-10-13
* | | | | Merge branch 'wk/t1304-wo-USER'Junio C Hamano2014-10-24
|\ \ \ \ \
| * | | | | t1304: Set LOGNAME even if USER is unset or nullW. Trevor King2014-10-19
| | |/ / / | |/| | |
* | | | | Merge branch 'tb/core-filemode-doc'Junio C Hamano2014-10-24
|\ \ \ \ \
| * | | | | core.filemode may need manual actionTorsten Bögershausen2014-10-19
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/run-command-env-array'Junio C Hamano2014-10-24
|\ \ \ \ \
| * | | | | use env_array member of struct child_processRené Scharfe2014-10-19
| * | | | | run-command: add env_array, an optional argv_array for envRené Scharfe2014-10-19
* | | | | | Merge branch 'po/doc-status-markup'Junio C Hamano2014-10-24
|\ \ \ \ \ \
| * | | | | | doc: fix 'git status --help' character quotingPhilip Oakley2014-10-19
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Junio C Hamano2014-10-24
|\ \ \ \ \ \
| * | | | | | pack-objects: turn off bitmaps when we split packsJeff King2014-10-19
| | |_|/ / / | |/| | | |
* | | | | | Update draft release notes to 2.2Junio C Hamano2014-10-21
* | | | | | Merge branch 'js/completion-hide-not-a-repo'Junio C Hamano2014-10-21
|\ \ \ \ \ \
| * | | | | | completion: silence "fatal: Not a git repository" errorJohn Szakmeister2014-10-14
* | | | | | | Merge branch 'da/mergetool-meld'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \
| * | | | | | | mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar2014-10-16
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \
| * | | | | | | t7610-mergetool: add test cases for mergetool.writeToTempDavid Aguilar2014-10-16
| * | | | | | | mergetool: add an option for writing to a temporary directoryDavid Aguilar2014-10-16
* | | | | | | | Merge branch 'da/mergetool-tool-help'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \ \
| * | | | | | | | difftool: don't assume that default sh is saneCharles Bailey2014-10-15
| * | | | | | | | mergetool: don't require a work tree for --tool-helpCharles Bailey2014-10-15
| * | | | | | | | git-sh-setup: move GIT_DIR initialization into a functionDavid Aguilar2014-10-15
| * | | | | | | | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-15
| * | | | | | | | test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar2014-10-15
| * | | | | | | | t7610-mergetool: prefer test_config over git configDavid Aguilar2014-10-15
* | | | | | | | | Merge branch 'da/mergetool-temporary-filename'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | mergetool: use more conservative temporary filenamesDavid Aguilar2014-10-16
* | | | | | | | | Merge branch 'da/mergetool-tests'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar2014-10-16
| * | | | | | | | t7610-mergetool: use test_config to isolate testsDavid Aguilar2014-10-16
| |/ / / / / / /
| * | | | | | | t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar2014-10-15
| * | | | | | | t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar2014-10-15
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \