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