summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* send-email: detect and offer to skip backup filesjc/send-email-skip-backupJunio C Hamano2016-04-121-0/+40
* Git 2.7.4v2.7.4Junio C Hamano2016-03-173-2/+13
* Sync with Git 2.6.6Junio C Hamano2016-03-174-3/+39
|\
| * Git 2.6.6v2.6.6Junio C Hamano2016-03-174-3/+15
| * Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2016-03-1716-148/+110
| |\
| | * Git 2.5.5v2.5.5Junio C Hamano2016-03-174-3/+15
| | * Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-1715-147/+97
| | |\
| | | * Git 2.4.11v2.4.11Junio C Hamano2016-03-174-3/+15
| | | * Merge branch 'jk/path-name-safety-2.4' into maint-2.4Junio C Hamano2016-03-1713-146/+84
| | | |\
* | | | \ Merge branch 'jk/path-name-safety-2.7' into maintJunio C Hamano2016-03-1610-142/+46
|\ \ \ \ \
| * \ \ \ \ Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7Junio C Hamano2016-03-1610-142/+46
| |\ \ \ \ \ |/ / / / / /
| * | | | | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6Junio C Hamano2016-03-1613-146/+84
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5jk/path-name-safety-2.5Junio C Hamano2016-03-1613-146/+84
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | list-objects: pass full pathname to callbacksjk/path-name-safety-2.4Jeff King2016-03-169-58/+26
| | | * | list-objects: drop name_path entirelyJeff King2016-03-169-25/+19
| | | * | list-objects: convert name_path to a strbufJeff King2016-03-163-36/+15
| | | * | show_object_with_name: simplify by using path_name()Jeff King2016-03-161-34/+6
| | | * | http-push: stop using name_pathJeff King2016-03-161-16/+7
| | | * | tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-03-162-4/+4
| | | * | add helpers for detecting size_t overflowJeff King2016-03-161-0/+34
| | | |/
* | | | Git 2.7.3v2.7.3Junio C Hamano2016-03-104-3/+66
* | | | Merge branch 'ma/update-hooks-sample-typofix' into maintJunio C Hamano2016-03-101-1/+1
|\ \ \ \
| * | | | templates/hooks: fix minor typo in the sample update-hookma/update-hooks-sample-typofixMartin Amdisen2016-02-251-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'dt/initial-ref-xn-commit-doc' into maintJunio C Hamano2016-03-101-0/+12
|\ \ \ \
| * | | | refs: document transaction semanticsdt/initial-ref-xn-commit-docDavid Turner2016-02-251-0/+12
* | | | | Merge branch 'ps/plug-xdl-merge-leak' into maintJunio C Hamano2016-03-101-2/+7
|\ \ \ \ \
| * | | | | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leakPatrick Steinhardt2016-02-231-2/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'ak/git-strip-extension-from-dashed-command' into maintJunio C Hamano2016-03-102-15/+15
|\ \ \ \ \
| * | | | | git.c: simplify stripping extension of a file in handle_builtin()ak/git-strip-extension-from-dashed-commandAlexander Kuleshov2016-02-212-15/+15
* | | | | | Merge branch 'ak/extract-argv0-last-dir-sep' into maintJunio C Hamano2016-03-101-4/+2
|\ \ \ \ \ \
| * | | | | | exec_cmd.c: use find_last_dir_sep() for code simplificationak/extract-argv0-last-dir-sepAlexander Kuleshov2016-02-191-4/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-104-0/+207
|\ \ \ \ \ \
| * | | | | | sha1_file.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-271-3/+3
| * | | | | | use_pack: handle signed off_t overflowJeff King2016-02-252-1/+3
| * | | | | | nth_packed_object_offset: bounds-check extended offsetJeff King2016-02-254-1/+27
| * | | | | | t5313: test bounds-checks of corrupted/malicious pack/idx filesJeff King2016-02-251-0/+179
| |/ / / / /
* | | | | | Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-102-0/+14
|\ \ \ \ \ \
| * | | | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repositoryJohannes Schindelin2016-02-252-0/+14
* | | | | | | Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-102-8/+27
|\ \ \ \ \ \ \
| * | | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fixStefan Beller2016-02-242-8/+27
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/grep-binary-workaround-in-test' into maintJunio C Hamano2016-03-102-13/+17
|\ \ \ \ \ \ \
| * | | | | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-testJohn Keeping2016-02-231-1/+1
| * | | | | | | t8005: avoid grep on non-ASCII dataJohn Keeping2016-02-231-12/+16
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mm/push-simple-doc' into maintJunio C Hamano2016-03-101-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Documentation/git-push: document that 'simple' is the defaultmm/push-simple-docMatthieu Moy2016-02-231-0/+7
| |/ / / / / /
* | | | | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-1091-482/+441
|\ \ \ \ \ \ \
| * | | | | | | compat/mingw: brown paper bag fix for 50a6c8eJeff King2016-02-291-1/+1
| * | | | | | | ewah: convert to REALLOC_ARRAY, etcJeff King2016-02-223-19/+8
| * | | | | | | convert ewah/bitmap code to use xmallocJeff King2016-02-224-30/+11
| * | | | | | | diff_populate_gitlink: use a strbufJeff King2016-02-221-8/+8
View Lorry Controller Status