summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-optionsFabian Ruch2015-12-112-11/+23
* Prepare for 2.6.5Junio C Hamano2015-12-112-1/+26
* Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano2015-12-111-1/+3
|\
| * revision.c: fix possible null pointer arithmeticsn/null-pointer-arith-in-mark-tree-uninterestingStefan Naewe2015-12-071-1/+3
* | Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-114-5/+8
|\ \
| * | Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-014-5/+8
* | | Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-111-1/+1
|\ \ \
| * | | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquoteCharles Bailey2015-12-041-1/+1
* | | | Merge branch 'sb/doc-submodule-sync-recursive' into maintJunio C Hamano2015-12-111-1/+4
|\ \ \ \
| * | | | document submodule sync --recursivesb/doc-submodule-sync-recursiveStefan Beller2015-12-041-1/+4
| | |_|/ | |/| |
* | | | Merge branch 'nd/doc-check-ref-format-typo' into maintJunio C Hamano2015-12-111-1/+1
|\ \ \ \
| * | | | git-check-ref-format.txt: typo, s/avoids/avoid/nd/doc-check-ref-format-typoNguyễn Thái Ngọc Duy2015-12-041-1/+1
| |/ / /
* | | | Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-111-16/+8
|\ \ \ \
| * | | | show-branch: use argv_array for default argumentsrs/show-branch-argv-arrayRené Scharfe2015-11-011-16/+8
* | | | | Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-1110-92/+31
|\ \ \ \ \
| * | | | | use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commitRené Scharfe2015-10-2610-92/+31
| | |/ / / | |/| | |
* | | | | Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2015-12-112-74/+124
|\ \ \ \ \
| * | | | | contrib/subtree: respect spaces in a repository pathas/subtree-with-spacesAlexey Shumkin2015-09-082-1/+48
| * | | | | t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin2015-09-082-73/+76
* | | | | | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-114-16/+31
|\ \ \ \ \ \
| * | | | | | test-lib-functions: detect test_when_finished in subshelljk/test-lint-forbid-when-finished-in-subshellJohn Keeping2015-09-081-0/+5
| * | | | | | t7800: don't use test_config in a subshellJohn Keeping2015-09-081-4/+4
| * | | | | | test-lib-functions: support "test_config -C <dir> ..."John Keeping2015-09-081-3/+17
| * | | | | | t5801: don't use test_when_finished in a subshellJohn Keeping2015-09-081-8/+4
| * | | | | | t7610: don't use test_config in a subshellJohn Keeping2015-09-081-1/+1
* | | | | | | Documentation/git-update-index: add missing opts to synopsisChristian Couder2015-12-101-0/+1
* | | | | | | Git 2.6.4v2.6.4Junio C Hamano2015-12-083-2/+18
* | | | | | | Merge branch 'rs/status-detached-head-memcmp' into maintJunio C Hamano2015-12-081-5/+4
|\ \ \ \ \ \ \
| * | | | | | | wt-status: correct and simplify check for detached HEADrs/status-detached-head-memcmpRené Scharfe2015-11-281-5/+4
* | | | | | | | Merge branch 'ad/sha1-update-chunked' into maintJunio C Hamano2015-12-087-13/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1: allow limiting the size of the data passed to SHA1_Update()ad/sha1-update-chunkedAtousa Pahlevan Duprat2015-11-055-0/+44
| * | | | | | | | sha1: provide another level of indirection for the SHA-1 functionsAtousa Pahlevan Duprat2015-11-053-13/+25
* | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2015-12-082-7/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphanSZEDER Gábor2015-11-242-5/+4
| * | | | | | | | | bash prompt: remove a redundant 'git diff' optionSZEDER Gábor2015-11-241-1/+1
| * | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor2015-11-241-3/+28
* | | | | | | | | | Merge branch 'jk/interpret-trailers-outside-a-repository' into maintJunio C Hamano2015-12-081-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | interpret-trailers: allow running outside a repositoryjk/interpret-trailers-outside-a-repositoryJohn Keeping2015-09-081-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/rebase-no-autostash' into maintJunio C Hamano2015-12-083-2/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-rebase: fix --no-autostash formattingjk/rebase-no-autostashJohn Keeping2015-09-101-1/+2
| * | | | | | | | | | rebase: support --no-autostashJohn Keeping2015-09-102-1/+14
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Prepare for 2.6.4Junio C Hamano2015-12-042-1/+49
* | | | | | | | | | Merge branch 'da/difftool' into maintJunio C Hamano2015-12-042-3/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-292-3/+20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-046-22/+78
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | gc: remove garbage .idx files from pack dirdk/gc-idx-wo-packDoug Kelly2015-11-042-1/+22
| * | | | | | | | | t5304: test cleaning pack garbageDoug Kelly2015-11-041-0/+21
| * | | | | | | | | prepare_packed_git(): refactor garbage reporting in pack directoryJunio C Hamano2015-08-174-22/+36
* | | | | | | | | | Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-012-35/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: clean up after p4 submit failureeg/p4-submit-catch-failureGIRARD Etienne2015-11-242-35/+38
View Lorry Controller Status