Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflict | David Aguilar | 2016-03-10 | 2 | -1/+35 | |
| * | | | | | | | | | | | | | mergetool: support delete/delete conflicts | David Aguilar | 2016-03-10 | 2 | -3/+50 | |
* | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-update' | Junio C Hamano | 2016-04-06 | 18 | -62/+445 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | clone: allow an explicit argument for parallel submodule clones | Stefan Beller | 2016-03-01 | 3 | -7/+33 | |
| * | | | | | | | | | | | | | | submodule update: expose parallelism to the user | Stefan Beller | 2016-03-01 | 4 | -2/+34 | |
| * | | | | | | | | | | | | | | submodule helper: remove double 'fatal: ' prefix | Stefan Beller | 2016-03-01 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | git submodule update: have a dedicated helper for cloning | Stefan Beller | 2016-03-01 | 2 | -34/+259 | |
| * | | | | | | | | | | | | | | run_processes_parallel: rename parameters for the callbacks | Stefan Beller | 2016-03-01 | 2 | -7/+7 | |
| * | | | | | | | | | | | | | | run_processes_parallel: treat output of children as byte array | Stefan Beller | 2016-03-01 | 3 | -4/+16 | |
| * | | | | | | | | | | | | | | submodule update: direct error message to stderr | Stefan Beller | 2016-03-01 | 2 | -4/+4 | |
| * | | | | | | | | | | | | | | fetching submodules: respect `submodule.fetchJobs` config option | Stefan Beller | 2016-03-01 | 5 | -2/+38 | |
| * | | | | | | | | | | | | | | submodule-config: drop check against NULL | Stefan Beller | 2016-03-01 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | submodule-config: keep update strategy around | Stefan Beller | 2016-03-01 | 4 | -0/+52 | |
* | | | | | | | | | | | | | | | Merge branch 'ss/receive-pack-parse-options' | Junio C Hamano | 2016-04-06 | 1 | -33/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | builtin/receive-pack.c: use parse_options APIss/receive-pack-parse-options | Sidhant Sharma [:tk] | 2016-03-01 | 1 | -33/+20 | |
* | | | | | | | | | | | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits' | Junio C Hamano | 2016-04-06 | 3 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | dir: store EXC_FLAG_* values in unsigned integersss/exc-flag-is-a-collection-of-bits | Saurav Sachidanand | 2016-03-01 | 3 | -9/+9 | |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | First batch for post 2.8 cycle | Junio C Hamano | 2016-04-03 | 2 | -1/+85 | |
* | | | | | | | | | | | | | | | | Sync with Git 2.8.1 | Junio C Hamano | 2016-04-03 | 4 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Git 2.8.1v2.8.1 | Junio C Hamano | 2016-04-03 | 4 | -3/+13 | |
| * | | | | | | | | | | | | | | | | Merge branch 'mm/readme-markdown' into maint | Junio C Hamano | 2016-04-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/startup-info' | Junio C Hamano | 2016-04-03 | 13 | -26/+54 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | use setup_git_directory() in test-* programsjk/startup-info | Jeff King | 2016-03-07 | 2 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | grep: turn off gitlink detection for --no-index | Jeff King | 2016-03-07 | 2 | -2/+31 | |
| * | | | | | | | | | | | | | | | | | mailmap: do not resolve blobs in a non-repository | Jeff King | 2016-03-06 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | remote: don't resolve HEAD in non-repository | Jeff King | 2016-03-06 | 1 | -5/+6 | |
| * | | | | | | | | | | | | | | | | | setup: set startup_info->have_repository more reliably | Jeff King | 2016-03-06 | 2 | -1/+4 | |
| * | | | | | | | | | | | | | | | | | setup: make startup_info available everywhere | Jeff King | 2016-03-06 | 6 | -17/+7 | |
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'es/test-gpg-tags' | Junio C Hamano | 2016-04-03 | 2 | -35/+65 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | t6302: skip only signed tags rather than all tests when GPG is missing | Eric Sunshine | 2016-03-06 | 1 | -19/+25 | |
| * | | | | | | | | | | | | | | | | | t6302: also test annotated in addition to signed tags | Eric Sunshine | 2016-03-06 | 1 | -0/+25 | |
| * | | | | | | | | | | | | | | | | | t6302: normalize names and descriptions of signed tags | Eric Sunshine | 2016-03-06 | 1 | -15/+15 | |
| * | | | | | | | | | | | | | | | | | lib-gpg: drop unnecessary "missing GPG" warning | Eric Sunshine | 2016-03-06 | 1 | -3/+2 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/getwholeline-getdelim-empty' | Junio C Hamano | 2016-04-03 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | strbuf_getwholeline: NUL-terminate getdelim buffer on errorjk/getwholeline-getdelim-empty | Jeff King | 2016-03-05 | 2 | -1/+11 | |
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' | Junio C Hamano | 2016-04-03 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | xdiff/xprepare: fix a memory leakrj/xdiff-prepare-plug-leak-on-error-codepath | Ramsay Jones | 2016-03-04 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits | Ramsay Jones | 2016-03-04 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack' | Junio C Hamano | 2016-04-03 | 1 | -18/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | index-pack: add a helper function to derive .idx/.keep filenamejc/index-pack | Junio C Hamano | 2016-03-03 | 1 | -18/+17 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-pack | Junio C Hamano | 2016-03-03 | 2 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' | Junio C Hamano | 2016-04-03 | 3 | -3/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | fetch-pack: update the documentation for "<refs>..." argumentsgf/fetch-pack-direct-object-fetch | Gabriel Souza Franco | 2016-03-05 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1 | Gabriel Souza Franco | 2016-03-01 | 2 | -3/+27 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' | Junio C Hamano | 2016-04-03 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keep | Junio C Hamano | 2016-03-03 | 2 | -1/+7 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'mm/lockfile-error-message' | Junio C Hamano | 2016-04-03 | 1 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | lockfile: improve error message when lockfile existsmm/lockfile-error-message | Matthieu Moy | 2016-03-01 | 1 | -3/+5 | |
| * | | | | | | | | | | | | | | | | | | lockfile: mark strings for translation | Matthieu Moy | 2016-03-01 | 1 | -3/+3 | |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' | Junio C Hamano | 2016-04-03 | 2 | -18/+77 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |