summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ident: loosen getpwuid error in non-strict modejk/ident-loosen-getpwuidJeff King2015-12-141-8/+22
* ident: keep a flag for bogus default_emailJeff King2015-12-101-7/+12
* ident: make xgetpwuid_self() a static local helperJeff King2015-12-103-15/+12
* 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
* | | | | | | Merge branch 'dk/check-ignore-docs' into maintJeff King2015-12-011-5/+5
|\ \ \ \ \ \ \
| * | | | | | | check-ignore: correct documentation about outputdk/check-ignore-docsDennis Kaarsemaker2015-11-241-5/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-012-9/+36
|\ \ \ \ \ \ \
| * | | | | | | git-p4: work with a detached headld/p4-detached-headLuke Diamand2015-11-242-8/+17
| * | | | | | | git-p4: add option to system() to return subshell statusLuke Diamand2015-11-241-2/+4
| * | | | | | | git-p4: add failing test for submit from detached headLuke Diamand2015-11-241-0/+16
* | | | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maintJeff King2015-12-012-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filtersg/filter-branch-dwim-ambiguitySZEDER Gábor2015-11-242-1/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'mg/doc-word-diff-example' into maintJeff King2015-12-011-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/diff: give --word-diff-regex=. examplemg/doc-word-diff-exampleMichael J Gruber2015-11-241-0/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'cb/ssl-config-pathnames' into maintJeff King2015-12-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | http: treat config options sslCAPath and sslCAInfo as pathscb/ssl-config-pathnamesCharles Bailey2015-11-241-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'dk/t5813-unc-paths' into maintJeff King2015-12-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | t5813: avoid creating urls that break on cygwindk/t5813-unc-pathsDennis Kaarsemaker2015-11-201-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dk/rerere-train-quoting' into maintJeff King2015-12-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Escape Git's exec path in contrib/rerere-train.sh scriptdk/rerere-train-quotingDaniel Knittl-Frank2015-11-201-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'cb/hook-sigpipe' into maintJeff King2015-12-013-20/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | allow hooks to ignore their standard input streamcb/hook-sigpipeClemens Buchacher2015-11-163-20/+27
| |/ / / / / / /
* | | | | | | | Merge branch 'fm/shell-path-whitespace' into maintJeff King2015-12-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase-i-exec: Allow space in SHELL_PATHfm/shell-path-whitespaceFredrik Medley2015-11-131-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'ar/doc-env-variable-format' into maintJeff King2015-12-011-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: make environment variable formatting more consistentar/doc-env-variable-formatАндрей Рыбак2015-11-111-6/+6
| |/ / / / / / /
View Lorry Controller Status