Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | RelNotes for 2.8.0: typofixjc/relnotes-2.8 | Junio C Hamano | 2016-03-14 | 1 | -14/+10 |
* | Merge branch 'mg/wt-status-mismarked-i18n' | Junio C Hamano | 2016-03-14 | 1 | -2/+2 |
|\ | |||||
| * | wt-status: allow "ahead " to be picked up by l10nmg/wt-status-mismarked-i18n | Michael J Gruber | 2016-03-14 | 1 | -2/+2 |
* | | Git 2.8-rc2v2.8.0-rc2 | Junio C Hamano | 2016-03-10 | 2 | -5/+6 |
* | | Sync with 2.7.3 | Junio C Hamano | 2016-03-10 | 2 | -1/+64 |
|\ \ | |||||
| * | | Git 2.7.3v2.7.3 | Junio C Hamano | 2016-03-10 | 4 | -3/+66 |
| * | | Merge branch 'ma/update-hooks-sample-typofix' into maint | Junio C Hamano | 2016-03-10 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'dt/initial-ref-xn-commit-doc' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+12 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ps/plug-xdl-merge-leak' into maint | Junio C Hamano | 2016-03-10 | 1 | -2/+7 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ak/git-strip-extension-from-dashed-command' into maint | Junio C Hamano | 2016-03-10 | 2 | -15/+15 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ak/extract-argv0-last-dir-sep' into maint | Junio C Hamano | 2016-03-10 | 1 | -4/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/pack-idx-corruption-safety' into maint | Junio C Hamano | 2016-03-10 | 4 | -0/+207 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'js/config-set-in-non-repository' into maint | Junio C Hamano | 2016-03-10 | 2 | -0/+14 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-module-list-fix' into maint | Junio C Hamano | 2016-03-10 | 2 | -8/+27 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/grep-binary-workaround-in-test' into maint | Junio C Hamano | 2016-03-10 | 2 | -13/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/push-simple-doc' into maint | Junio C Hamano | 2016-03-10 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/tighten-alloc' into maint | Junio C Hamano | 2016-03-10 | 91 | -482/+441 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/more-comments-on-textconv' into maint | Junio C Hamano | 2016-03-10 | 3 | -1/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/no-diff-emit-common' into maint | Junio C Hamano | 2016-03-10 | 4 | -57/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/am-i-v-fix' into maint | Junio C Hamano | 2016-03-10 | 3 | -9/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/git-common-dir-fix' into maint | Junio C Hamano | 2016-03-10 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint | Junio C Hamano | 2016-03-10 | 5 | -33/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/epipe-in-async' into maint | Junio C Hamano | 2016-03-10 | 6 | -3/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ps/config-error' into maint | Junio C Hamano | 2016-03-10 | 13 | -105/+159 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/work-tree-tests' into maint | Junio C Hamano | 2016-03-10 | 3 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sp/remote-curl-ssl-strerror' into maint | Junio C Hamano | 2016-03-10 | 1 | -2/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jx/http-no-proxy' | Junio C Hamano | 2016-03-10 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | http: honor no_http env variable to bypass proxyjx/http-no-proxy | Jiang Xin | 2016-02-29 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/exclusion-doc' | Junio C Hamano | 2016-03-10 | 1 | -1/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | gitignore: document that unignoring a directory unignores everything in itjc/exclusion-doc | Junio C Hamano | 2016-03-08 | 1 | -1/+37 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/close-packs-before-gc' | Junio C Hamano | 2016-03-10 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | t5510: do not leave changed cwd | Michael J Gruber | 2016-03-04 | 1 | -4/+6 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/rebase-summary' | Junio C Hamano | 2016-03-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: reword rebase summarysb/rebase-summary | Stefan Beller | 2016-03-02 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.8-rc1v2.8.0-rc1 | Junio C Hamano | 2016-03-04 | 2 | -1/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/clear-gitenv-upon-use-of-alias' | Junio C Hamano | 2016-03-04 | 1 | -11/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | t0001: fix GIT_* environment variable check under --valgrindnd/clear-gitenv-upon-use-of-alias | Johannes Sixt | 2016-03-03 | 1 | -11/+9 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/pthread-exit-emu-windows' | Junio C Hamano | 2016-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark win32's pthread_exit() as NORETURNjs/pthread-exit-emu-windows | Johannes Schindelin | 2016-03-02 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-parallel-fetch' | Junio C Hamano | 2016-03-04 | 4 | -32/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | run-command: do not pass child process data into callbacks | Stefan Beller | 2016-03-01 | 4 | -32/+9 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | compat/mingw: brown paper bag fix for 50a6c8e | Jeff King | 2016-02-29 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/i18n-2.8.0' | Junio C Hamano | 2016-03-04 | 4 | -21/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | trailer.c: mark strings for translationnd/i18n-2.8.0 | Nguyễn Thái Ngọc Duy | 2016-02-29 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref-filter.c: mark strings for translation | Nguyễn Thái Ngọc Duy | 2016-02-29 | 1 | -14/+14 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'tb/avoid-gcc-on-darwin-10-6' | Junio C Hamano | 2016-03-04 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.mak.uname: use clang for Mac OS X 10.6 | Torsten Bögershausen | 2016-02-28 | 1 | -0/+3 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |