aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'da/difftool'Junio C Hamano2014-11-18
|\
| * difftool: honor --trust-exit-code for builtin toolsDavid Aguilar2014-11-14
* | Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano2014-11-12
|\ \
| * | t1410: fix breakage on case-insensitive filesystemsJeff King2014-11-10
* | | Merge branch 'tm/line-log-first-parent'Junio C Hamano2014-11-06
|\ \ \
| * | | line-log: fix crash when --first-parent is usedTzvetan Mikov2014-11-04
* | | | Merge branch 'jk/fetch-reflog-df-conflict'Junio C Hamano2014-11-06
|\ \ \ \ | | |/ / | |/| |
| * | | ignore stale directories when checking reflog existenceJeff King2014-11-04
| * | | fetch: load all default config at startupJeff King2014-11-04
* | | | Merge branch 'rs/grep-color-words'Junio C Hamano2014-10-31
|\ \ \ \
| * | | | grep: add color.grep.matchcontext and color.grep.matchselectedRené Scharfe2014-10-28
* | | | | Merge branch 'da/difftool'Junio C Hamano2014-10-29
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | difftool: add support for --trust-exit-codeDavid Aguilar2014-10-28
| * | | | difftool--helper: exit when reading a prompt answer failsJohannes Sixt2014-10-27
| * | | | Merge branch 'jk/mbox-from-line' into maintJunio C Hamano2014-10-07
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/fsck-exit-code-fix' into maintJunio C Hamano2014-09-29
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ta/config-add-to-empty-or-true-fix' into maintJunio C Hamano2014-09-29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mk/reachable-protect-detached-head' into maintJunio C Hamano2014-09-29
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mb/fast-import-delete-root' into maintJunio C Hamano2014-09-29
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/send-pack-many-refspecs' into maintJunio C Hamano2014-09-29
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'mg/lib-gpg-ro-safety'Junio C Hamano2014-10-29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t/lib-gpg: make gpghome files writableMichael J Gruber2014-10-27
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2014-10-29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | repack: pack objects mentioned by the indexJeff King2014-10-19
| * | | | | | | | | | | rev-list: add --indexed-objects optionJeff King2014-10-19
| * | | | | | | | | | | t5516: test pushing a tag of an otherwise unreferenced blobJeff King2014-10-19
| * | | | | | | | | | | write_sha1_file: freshen existing objectsJeff King2014-10-16
| * | | | | | | | | | | pack-objects: match prune logic for discarding objectsJeff King2014-10-16
| * | | | | | | | | | | prune: keep objects reachable from recent objectsJeff King2014-10-16
* | | | | | | | | | | | Merge branch 'jc/push-cert'Junio C Hamano2014-10-24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | push: heed user.signingkey for signed pushesMichael J Gruber2014-10-24
* | | | | | | | | | | | | Merge branch 'wk/t1304-wo-USER'Junio C Hamano2014-10-24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t1304: Set LOGNAME even if USER is unset or nullW. Trevor King2014-10-19
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting'Junio C Hamano2014-10-24
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pack-objects: turn off bitmaps when we split packsJeff King2014-10-19
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t7610-mergetool: add test cases for mergetool.writeToTempDavid Aguilar2014-10-16
* | | | | | | | | | | | | | Merge branch 'da/mergetool-tool-help'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar2014-10-15
| * | | | | | | | | | | | | | t7610-mergetool: prefer test_config over git configDavid Aguilar2014-10-15
* | | | | | | | | | | | | | | Merge branch 'da/mergetool-tests'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | test-lib-functions: adjust style to match CodingGuidelinesDavid Aguilar2014-10-16
| * | | | | | | | | | | | | | t7610-mergetool: use test_config to isolate testsDavid Aguilar2014-10-16
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar2014-10-15
| * | | | | | | | | | | | | t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar2014-10-15
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'rs/ref-transaction'Junio C Hamano2014-10-21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | refs.c: allow listing and deleting badly named refsRonnie Sahlberg2014-10-15
| * | | | | | | | | | | | | test: put tests for handling of bad ref names in one placeRonnie Sahlberg2014-10-15
| * | | | | | | | | | | | | branch -d: avoid repeated symref resolutionJonathan Nieder2014-10-15
| * | | | | | | | | | | | | reflog test: test interaction with detached HEADJunio C Hamano2014-10-15