aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* rebase -i: remember merge options beyond continue actionsFabian Ruch2015-12-11
* Prepare for 2.6.5Junio C Hamano2015-12-11
* Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano2015-12-11
|\
| * revision.c: fix possible null pointer arithmeticStefan Naewe2015-12-07
* | Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-11
|\ \
| * | Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-01
* | | Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-11
|\ \ \
| * | | t3404: fix quoting of redirect for some versions of bashCharles Bailey2015-12-04
* | | | Merge branch 'sb/doc-submodule-sync-recursive' into maintJunio C Hamano2015-12-11
|\ \ \ \
| * | | | document submodule sync --recursiveStefan Beller2015-12-04
| | |_|/ | |/| |
* | | | Merge branch 'nd/doc-check-ref-format-typo' into maintJunio C Hamano2015-12-11
|\ \ \ \
| * | | | git-check-ref-format.txt: typo, s/avoids/avoid/Nguyễn Thái Ngọc Duy2015-12-04
| |/ / /
* | | | Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-11
|\ \ \ \
| * | | | show-branch: use argv_array for default argumentsRené Scharfe2015-11-01
* | | | | Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-11
|\ \ \ \ \
| * | | | | use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe2015-10-26
| | |/ / / | |/| | |
* | | | | Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2015-12-11
|\ \ \ \ \
| * | | | | contrib/subtree: respect spaces in a repository pathAlexey Shumkin2015-09-08
| * | | | | t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin2015-09-08
* | | | | | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-11
|\ \ \ \ \ \
| * | | | | | test-lib-functions: detect test_when_finished in subshellJohn Keeping2015-09-08
| * | | | | | t7800: don't use test_config in a subshellJohn Keeping2015-09-08
| * | | | | | test-lib-functions: support "test_config -C <dir> ..."John Keeping2015-09-08
| * | | | | | t5801: don't use test_when_finished in a subshellJohn Keeping2015-09-08
| * | | | | | t7610: don't use test_config in a subshellJohn Keeping2015-09-08
* | | | | | | Documentation/git-update-index: add missing opts to synopsisChristian Couder2015-12-10
* | | | | | | Git 2.6.4v2.6.4Junio C Hamano2015-12-08
* | | | | | | Merge branch 'rs/status-detached-head-memcmp' into maintJunio C Hamano2015-12-08
|\ \ \ \ \ \ \
| * | | | | | | wt-status: correct and simplify check for detached HEADRené Scharfe2015-11-28
* | | | | | | | Merge branch 'ad/sha1-update-chunked' into maintJunio C Hamano2015-12-08
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1: allow limiting the size of the data passed to SHA1_Update()Atousa Pahlevan Duprat2015-11-05
| * | | | | | | | sha1: provide another level of indirection for the SHA-1 functionsAtousa Pahlevan Duprat2015-11-05
* | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2015-12-08
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bash prompt: indicate dirty index even on orphan branchesSZEDER Gábor2015-11-24
| * | | | | | | | | bash prompt: remove a redundant 'git diff' optionSZEDER Gábor2015-11-24
| * | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor2015-11-24
* | | | | | | | | | Merge branch 'jk/interpret-trailers-outside-a-repository' into maintJunio C Hamano2015-12-08
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | interpret-trailers: allow running outside a repositoryJohn Keeping2015-09-08
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/rebase-no-autostash' into maintJunio C Hamano2015-12-08
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-rebase: fix --no-autostash formattingJohn Keeping2015-09-10
| * | | | | | | | | | rebase: support --no-autostashJohn Keeping2015-09-10
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Prepare for 2.6.4Junio C Hamano2015-12-04
* | | | | | | | | | Merge branch 'da/difftool' into maintJunio C Hamano2015-12-04
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-29
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-04
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | gc: remove garbage .idx files from pack dirDoug Kelly2015-11-04
| * | | | | | | | | t5304: test cleaning pack garbageDoug Kelly2015-11-04
| * | | | | | | | | prepare_packed_git(): refactor garbage reporting in pack directoryJunio C Hamano2015-08-17
* | | | | | | | | | Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-p4: clean up after p4 submit failureGIRARD Etienne2015-11-24