summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Jeff King2015-12-015-21/+41
|\
| * Merge branch 'eg/p4-submit-catch-failure' into maintJeff King2015-12-011-1/+1
| |\
| | * git-p4: clean up after p4 submit failureeg/p4-submit-catch-failureGIRARD Etienne2015-11-241-1/+1
| * | Merge branch 'ld/p4-detached-head' into maintJeff King2015-12-011-0/+16
| |\ \
| | * | git-p4: work with a detached headld/p4-detached-headLuke Diamand2015-11-241-1/+1
| | * | 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-011-0/+7
| |\ \ \
| | * | | filter-branch: deal with object name vs. pathname ambiguity in tree-filtersg/filter-branch-dwim-ambiguitySZEDER Gábor2015-11-241-0/+7
| * | | | 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
| | |/ / /
| * | | | allow hooks to ignore their standard input streamcb/hook-sigpipeClemens Buchacher2015-11-161-18/+15
| |/ / /
| * | | Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-051-0/+14
| |\ \ \
| * \ \ \ Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-052-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-053-87/+130
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-052-0/+47
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-031-0/+33
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-031-1/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-031-0/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-031-0/+50
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-031-0/+12
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-031-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-031-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-031-0/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'js/gc-with-stale-symref' into maintJunio C Hamano2015-10-201-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-10-201-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/worktree-add-cleanup' into maintJunio C Hamano2015-10-161-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-161-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/http-flaky-test-fix' into maintJunio C Hamano2015-10-163-23/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/perf-without-installed-git' into maintJunio C Hamano2015-10-161-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano2015-10-161-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-10-161-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/notes-dwim-doc' into maintJunio C Hamano2015-10-161-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/connect-clear-env' into maintJunio C Hamano2015-10-161-0/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-161-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/ref-is-hidden-namespace'Jeff King2015-11-201-0/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | t5509: add basic tests for hideRefslf/ref-is-hidden-namespaceLukas Fleischer2015-11-051-0/+41
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dk/gc-idx-wo-pack'Jeff King2015-11-201-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | gc: remove garbage .idx files from pack dirdk/gc-idx-wo-packDoug Kelly2015-11-041-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | t5304: test cleaning pack garbageDoug Kelly2015-11-041-0/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent'Junio C Hamano2015-11-031-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | blame: allow blame --reverse --first-parent when it makes sensemk/blame-first-parentMax Kirillov2015-10-301-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | blame: test to describe use of blame --reverse --first-parentMax Kirillov2015-10-301-0/+36
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano2015-11-031-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | t7060: add test for status --branch on a detached HEADRené Scharfe2015-11-011-0/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/git-gdb'Junio C Hamano2015-11-032-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | test: facilitate debugging Git executables in tests with gdbjs/git-gdbJohannes Schindelin2015-10-302-0/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2015-11-031-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: ignore symbolic links in use_wt_fileDavid Aguilar2015-10-291-0/+19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kn/for-each-branch'Junio C Hamano2015-11-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status