summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'ky/branch-d-worktree' into maintJunio C Hamano2016-05-021-8/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch -d: refuse deleting a branch which is currently checked outky/branch-d-worktreeKazuki Yamaguchi2016-03-291-8/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/check-repository-format' into maintJunio C Hamano2016-05-021-21/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | init: use setup.c's repo version verificationJeff King2016-03-111-9/+12
| * | | | | | | | | wrap shared_repository global in get/set accessorsJeff King2016-03-111-12/+12
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maintJunio C Hamano2016-04-291-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-051-0/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sk/send-pack-all-fix' into maintJunio C Hamano2016-04-291-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fixStanislav Kolotinskiy2016-03-311-1/+1
* | | | | | | | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-141-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-voidJunio C Hamano2016-03-231-5/+5
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7Junio C Hamano2016-03-162-21/+6
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6Junio C Hamano2016-03-162-21/+6
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | * | | | | | | Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5jk/path-name-safety-2.5Junio C Hamano2016-03-162-21/+6
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | list-objects: pass full pathname to callbacksjk/path-name-safety-2.4Jeff King2016-03-162-21/+6
| | | | * | | | | list-objects: drop name_path entirelyJeff King2016-03-162-4/+4
| * | | | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-101-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-101-0/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-101-8/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-1021-101/+63
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-101-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-101-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-105-65/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-141-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msgSven Strickroth2016-03-211-1/+10
* | | | | | | | | | | | | | | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-142-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-071-2/+4
| * | | | | | | | | | | | | | | | | | setup: set startup_info->have_repository more reliablyJeff King2016-03-061-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-141-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-011-3/+13
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-141-18/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-varsJeff King2016-02-291-18/+32
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-141-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-281-1/+4
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-141-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-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keepJunio C Hamano2016-03-031-1/+1
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2016-03-241-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | submodule: fix regression for deinit without submodulesStefan Beller2016-03-221-3/+3
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/i18n-2.8.0'Junio C Hamano2016-03-042-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | builtin/clone.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-291-5/+5
| * | | | | | | | | | | | | | | | | | builtin/checkout.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-291-1/+1
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety'Junio C Hamano2016-03-041-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | nth_packed_object_offset: bounds-check extended offsetJeff King2016-02-251-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'js/config-set-in-non-repository'Junio C Hamano2016-02-261-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repositoryJohannes Schindelin2016-02-251-0/+3
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-223-7/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status