summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-061-0/+1
|\
| * replace --edit: respect core.editorjs/replace-edit-use-editor-configurationJohannes Schindelin2016-04-201-0/+1
| * Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2016-03-172-21/+6
| |\
| | * Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-172-21/+6
| | |\
* | | \ Merge branch 'cc/apply' into maintJunio C Hamano2016-05-061-15/+15
|\ \ \ \
| * | | | builtin/apply: free patch when parse_chunk() failscc/applyChristian Couder2016-04-011-1/+3
| * | | | builtin/apply: handle parse_binary() failureChristian Couder2016-04-011-0/+7
| * | | | apply: remove unused call to free() in gitdiff_{old,new}name()Junio C Hamano2016-03-221-6/+0
| * | | | builtin/apply: get rid of useless 'name' variableChristian Couder2016-03-221-8/+5
* | | | | Merge branch 'ad/commit-have-m-option' into maintJunio C Hamano2016-05-021-3/+3
|\ \ \ \ \
| * | | | | commit: do not ignore an empty message given by -m ''ad/commit-have-m-optionJeff King2016-04-071-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sb/submodule-helper-clone-regression-fix' into maintJunio C Hamano2016-05-021-23/+18
|\ \ \ \ \
| * | | | | submodule--helper, module_clone: catch fprintf failuresb/submodule-helper-clone-regression-fixStefan Beller2016-04-011-2/+2
| * | | | | submodule--helper: do not borrow absolute_path() result for too longJunio C Hamano2016-04-011-5/+4
| * | | | | submodule--helper, module_clone: always operate on absolute pathsStefan Beller2016-04-011-14/+14
| * | | | | submodule--helper clone: create the submodule path just onceStefan Beller2016-03-311-4/+0
| * | | | | submodule--helper: fix potential NULL-dereferenceStefan Beller2016-03-311-4/+4
* | | | | | Merge branch 'jk/branch-shortening-funny-symrefs' into maintJunio C Hamano2016-05-021-7/+12
|\ \ \ \ \ \
| * | | | | | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-041-7/+12
* | | | | | | Merge branch 'ky/branch-m-worktree' into maintJunio C Hamano2016-05-021-2/+1
|\ \ \ \ \ \ \
| * | | | | | | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-041-2/+1
* | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |
View Lorry Controller Status