summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-102-1/+35
| * | | | | | | | | | | | | mergetool: support delete/delete conflictsDavid Aguilar2016-03-102-3/+50
* | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-0618-62/+445
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | clone: allow an explicit argument for parallel submodule clonesStefan Beller2016-03-013-7/+33
| * | | | | | | | | | | | | | submodule update: expose parallelism to the userStefan Beller2016-03-014-2/+34
| * | | | | | | | | | | | | | submodule helper: remove double 'fatal: ' prefixStefan Beller2016-03-011-2/+2
| * | | | | | | | | | | | | | git submodule update: have a dedicated helper for cloningStefan Beller2016-03-012-34/+259
| * | | | | | | | | | | | | | run_processes_parallel: rename parameters for the callbacksStefan Beller2016-03-012-7/+7
| * | | | | | | | | | | | | | run_processes_parallel: treat output of children as byte arrayStefan Beller2016-03-013-4/+16
| * | | | | | | | | | | | | | submodule update: direct error message to stderrStefan Beller2016-03-012-4/+4
| * | | | | | | | | | | | | | fetching submodules: respect `submodule.fetchJobs` config optionStefan Beller2016-03-015-2/+38
| * | | | | | | | | | | | | | submodule-config: drop check against NULLStefan Beller2016-03-011-3/+3
| * | | | | | | | | | | | | | submodule-config: keep update strategy aroundStefan Beller2016-03-014-0/+52
* | | | | | | | | | | | | | | Merge branch 'ss/receive-pack-parse-options'Junio C Hamano2016-04-061-33/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | builtin/receive-pack.c: use parse_options APIss/receive-pack-parse-optionsSidhant Sharma [:tk]2016-03-011-33/+20
* | | | | | | | | | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits'Junio C Hamano2016-04-063-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | dir: store EXC_FLAG_* values in unsigned integersss/exc-flag-is-a-collection-of-bitsSaurav Sachidanand2016-03-013-9/+9
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | First batch for post 2.8 cycleJunio C Hamano2016-04-032-1/+85
* | | | | | | | | | | | | | | | Sync with Git 2.8.1Junio C Hamano2016-04-034-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Git 2.8.1v2.8.1Junio C Hamano2016-04-034-3/+13
| * | | | | | | | | | | | | | | | Merge branch 'mm/readme-markdown' into maintJunio C Hamano2016-04-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/startup-info'Junio C Hamano2016-04-0313-26/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | use setup_git_directory() in test-* programsjk/startup-infoJeff King2016-03-072-0/+4
| * | | | | | | | | | | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-072-2/+31
| * | | | | | | | | | | | | | | | | mailmap: do not resolve blobs in a non-repositoryJeff King2016-03-061-1/+2
| * | | | | | | | | | | | | | | | | remote: don't resolve HEAD in non-repositoryJeff King2016-03-061-5/+6
| * | | | | | | | | | | | | | | | | setup: set startup_info->have_repository more reliablyJeff King2016-03-062-1/+4
| * | | | | | | | | | | | | | | | | setup: make startup_info available everywhereJeff King2016-03-066-17/+7
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'es/test-gpg-tags'Junio C Hamano2016-04-032-35/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | t6302: skip only signed tags rather than all tests when GPG is missingEric Sunshine2016-03-061-19/+25
| * | | | | | | | | | | | | | | | | t6302: also test annotated in addition to signed tagsEric Sunshine2016-03-061-0/+25
| * | | | | | | | | | | | | | | | | t6302: normalize names and descriptions of signed tagsEric Sunshine2016-03-061-15/+15
| * | | | | | | | | | | | | | | | | lib-gpg: drop unnecessary "missing GPG" warningEric Sunshine2016-03-061-3/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty'Junio C Hamano2016-04-032-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-emptyJeff King2016-03-052-1/+11
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'Junio C Hamano2016-04-031-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | xdiff/xprepare: fix a memory leakrj/xdiff-prepare-plug-leak-on-error-codepathRamsay Jones2016-03-041-0/+1
| * | | | | | | | | | | | | | | | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones2016-03-041-1/+1
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack'Junio C Hamano2016-04-031-18/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | index-pack: add a helper function to derive .idx/.keep filenamejc/index-packJunio C Hamano2016-03-031-18/+17
| * | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-032-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch'Junio C Hamano2016-04-033-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsgf/fetch-pack-direct-object-fetchGabriel Souza Franco2016-03-051-0/+4
| * | | | | | | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-012-3/+27
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep'Junio C Hamano2016-04-032-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keepJunio C Hamano2016-03-032-1/+7
* | | | | | | | | | | | | | | | | | Merge branch 'mm/lockfile-error-message'Junio C Hamano2016-04-031-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | lockfile: improve error message when lockfile existsmm/lockfile-error-messageMatthieu Moy2016-03-011-3/+5
| * | | | | | | | | | | | | | | | | | lockfile: mark strings for translationMatthieu Moy2016-03-011-3/+3
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars'Junio C Hamano2016-04-032-18/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \