Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint | Junio C Hamano | 2016-04-29 | 1 | -0/+1 |
|\ | |||||
| * | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlf | Torsten Bögershausen | 2016-04-05 | 1 | -0/+1 |
* | | Merge branch 'sk/send-pack-all-fix' into maint | Junio C Hamano | 2016-04-29 | 1 | -1/+1 |
|\ \ | |||||
| * | | git-send-pack: fix --all option when used with directorysk/send-pack-all-fix | Stanislav Kolotinskiy | 2016-03-31 | 1 | -1/+1 |
* | | | Merge branch 'jv/merge-nothing-into-void' into maint | Junio C Hamano | 2016-04-14 | 1 | -5/+5 |
|\ \ \ | |||||
| * | | | merge: fix NULL pointer dereference when merging nothing into voidjv/merge-nothing-into-void | Junio C Hamano | 2016-03-23 | 1 | -5/+5 |
| * | | | Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7 | Junio C Hamano | 2016-03-16 | 2 | -21/+6 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6 | Junio C Hamano | 2016-03-16 | 2 | -21/+6 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5jk/path-name-safety-2.5 | Junio C Hamano | 2016-03-16 | 2 | -21/+6 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | list-objects: pass full pathname to callbacksjk/path-name-safety-2.4 | Jeff King | 2016-03-16 | 2 | -21/+6 |
| | | | * | | list-objects: drop name_path entirely | Jeff King | 2016-03-16 | 2 | -4/+4 |
| * | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'js/config-set-in-non-repository' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'sb/submodule-module-list-fix' into maint | Junio C Hamano | 2016-03-10 | 1 | -8/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-03-10 | 21 | -101/+63 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/am-i-v-fix' into maint | Junio C Hamano | 2016-03-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/git-common-dir-fix' into maint | Junio C Hamano | 2016-03-10 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint | Junio C Hamano | 2016-03-10 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/config-error' into maint | Junio C Hamano | 2016-03-10 | 5 | -65/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ss/commit-squash-msg' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | commit: do not lose SQUASH_MSG contentsss/commit-squash-msg | Sven Strickroth | 2016-03-21 | 1 | -1/+10 |
* | | | | | | | | | | | | | | | Merge branch 'jk/startup-info' into maint | Junio C Hamano | 2016-04-14 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | grep: turn off gitlink detection for --no-index | Jeff King | 2016-03-07 | 1 | -2/+4 |
| * | | | | | | | | | | | | | | | setup: set startup_info->have_repository more reliably | Jeff King | 2016-03-06 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-14 | 1 | -3/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | fetch-pack: fix object_id of exact sha1 | Gabriel Souza Franco | 2016-03-01 | 1 | -3/+13 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-local-env-vars' into maint | Junio C Hamano | 2016-04-14 | 1 | -18/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-vars | Jeff King | 2016-02-29 | 1 | -18/+32 |
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/config-get-urlmatch' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | config: fail if --get-urlmatch finds no value | John Keeping | 2016-02-28 | 1 | -1/+4 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jc/index-pack' into maint | Junio C Hamano | 2016-04-14 | 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 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keep | Junio C Hamano | 2016-03-03 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-pathspec-fix' | Junio C Hamano | 2016-03-24 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | submodule: fix regression for deinit without submodules | Stefan Beller | 2016-03-22 | 1 | -3/+3 |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'nd/i18n-2.8.0' | Junio C Hamano | 2016-03-04 | 2 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | builtin/clone.c: mark strings for translation | Nguyễn Thái Ngọc Duy | 2016-02-29 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | | builtin/checkout.c: mark strings for translation | Nguyễn Thái Ngọc Duy | 2016-02-29 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/pack-idx-corruption-safety' | Junio C Hamano | 2016-03-04 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | nth_packed_object_offset: bounds-check extended offset | Jeff King | 2016-02-25 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'js/config-set-in-non-repository' | Junio C Hamano | 2016-02-26 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repository | Johannes Schindelin | 2016-02-25 | 1 | -0/+3 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'nd/ita-cleanup' into maint | Junio C Hamano | 2016-02-22 | 3 | -7/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ah/stripspace-optstring' into maint | Junio C Hamano | 2016-02-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/push-default-warning' | Junio C Hamano | 2016-02-26 | 1 | -34/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | push: remove "push.default is unset" warning messagemm/push-default-warning | Matthieu Moy | 2016-02-25 | 1 | -34/+0 |
* | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-module-list-fix' | Junio C Hamano | 2016-02-26 | 1 | -8/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fix | Stefan Beller | 2016-02-24 | 1 | -8/+2 |
* | | | | | | | | | | | | | | | | | Merge branch 'ps/config-error' | Junio C Hamano | 2016-02-26 | 5 | -65/+42 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |