aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* ident: make xgetpwuid_self() a static local helperJeff King2015-12-10
* 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
* | | | | | | Merge branch 'dk/check-ignore-docs' into maintJeff King2015-12-01
|\ \ \ \ \ \ \
| * | | | | | | check-ignore: correct documentation about outputDennis Kaarsemaker2015-11-24
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-01
|\ \ \ \ \ \ \
| * | | | | | | git-p4: work with a detached headLuke Diamand2015-11-24
| * | | | | | | git-p4: add option to system() to return subshell statusLuke Diamand2015-11-24
| * | | | | | | git-p4: add failing test for submit from detached headLuke Diamand2015-11-24
* | | | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filterSZEDER Gábor2015-11-24
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'mg/doc-word-diff-example' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/diff: give --word-diff-regex=. exampleMichael J Gruber2015-11-24
| |/ / / / / / /
* | | | | | | | Merge branch 'cb/ssl-config-pathnames' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | http: treat config options sslCAPath and sslCAInfo as pathsCharles Bailey2015-11-24
| |/ / / / / / /
* | | | | | | | Merge branch 'dk/t5813-unc-paths' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | t5813: avoid creating urls that break on cygwinDennis Kaarsemaker2015-11-20
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dk/rerere-train-quoting' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | Escape Git's exec path in contrib/rerere-train.sh scriptDaniel Knittl-Frank2015-11-20
| |/ / / / / / /
* | | | | | | | Merge branch 'cb/hook-sigpipe' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | allow hooks to ignore their standard input streamClemens Buchacher2015-11-16
| |/ / / / / / /
* | | | | | | | Merge branch 'fm/shell-path-whitespace' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase-i-exec: Allow space in SHELL_PATHFredrik Medley2015-11-13
| |/ / / / / / /
* | | | | | | | Merge branch 'ar/doc-env-variable-format' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: make environment variable formatting more consistentАндрей Рыбак2015-11-11
| |/ / / / / / /
* | | | | | | | Merge branch 'pt/http-socks-proxy' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-http(s): support SOCKS proxiesPat Thoyts2015-11-20