aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-14
|\
| * merge: fix NULL pointer dereference when merging nothing into voidJunio C Hamano2016-03-23
| * Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7Junio C Hamano2016-03-16
| |\
| | * Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6Junio C Hamano2016-03-16
| | |\
| | | * Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5Junio C Hamano2016-03-16
| | | |\
| | | | * list-objects: pass full pathname to callbacksJeff King2016-03-16
| | | | * list-objects: drop name_path entirelyJeff King2016-03-16
| * | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-10
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-10
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | commit: do not lose SQUASH_MSG contentsSven Strickroth2016-03-21
* | | | | | | | | | | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | grep: turn off gitlink detection for --no-indexJeff King2016-03-07
| * | | | | | | | | | | | | | setup: set startup_info->have_repository more reliablyJeff King2016-03-06
* | | | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-01
* | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rev-parse: let some options run outside repositoryJeff King2016-02-29
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-28
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | index-pack: add a helper function to derive .idx/.keep filenameJunio C Hamano2016-03-03
| * | | | | | | | | | | | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]Junio C Hamano2016-03-03
* | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2016-03-24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | submodule: fix regression for deinit without submodulesStefan Beller2016-03-22
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'nd/i18n-2.8.0'Junio C Hamano2016-03-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | builtin/clone.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-29
| * | | | | | | | | | | | | | | | builtin/checkout.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-29
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety'Junio C Hamano2016-03-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | nth_packed_object_offset: bounds-check extended offsetJeff King2016-02-25
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'js/config-set-in-non-repository'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | git config: report when trying to modify a non-existing repo configJohannes Schindelin2016-02-25
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/push-default-warning'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | push: remove "push.default is unset" warning messageMatthieu Moy2016-02-25
* | | | | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-fix'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | submodule helper list: respect correct path prefixStefan Beller2016-02-24
* | | | | | | | | | | | | | | | Merge branch 'ps/config-error'Junio C Hamano2016-02-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | config: rename git_config_set_or_die to git_config_setPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | | | config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | | | init-db: die on config errors when initializing empty repoPatrick Steinhardt2016-02-22
| * | | | | | | | | | | | | | | clone: die on config error in cmd_clonePatrick Steinhardt2016-02-22