summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2015-12-08Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano1-3/+28
2015-12-08Merge branch 'jk/rebase-no-autostash' into maintJunio C Hamano1-0/+10
2015-12-04Merge branch 'da/difftool' into maintJunio C Hamano1-0/+19
2015-12-04Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano1-0/+21
2015-12-01Merge branch 'eg/p4-submit-catch-failure' into maintJeff King1-1/+1
2015-12-01Merge branch 'ld/p4-detached-head' into maintJeff King1-0/+16
2015-12-01Merge branch 'sg/filter-branch-dwim-ambiguity' into maintJeff King1-0/+7
2015-12-01Merge branch 'dk/t5813-unc-paths' into maintJeff King1-2/+2
2015-11-24filter-branch: deal with object name vs. pathname ambiguity in tree-filterSZEDER Gábor1-0/+7
2015-11-24git-p4: clean up after p4 submit failureGIRARD Etienne1-1/+1
2015-11-24bash prompt: indicate dirty index even on orphan branchesSZEDER Gábor1-2/+2
2015-11-24bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor1-3/+28
2015-11-24git-p4: work with a detached headLuke Diamand1-1/+1
2015-11-24git-p4: add failing test for submit from detached headLuke Diamand1-0/+16
2015-11-20t5813: avoid creating urls that break on cygwinDennis Kaarsemaker1-2/+2
2015-11-16allow hooks to ignore their standard input streamClemens Buchacher1-17/+14
2015-11-05Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano1-0/+14
2015-11-05Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2-0/+3
2015-11-05Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano3-87/+130
2015-11-05Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2-0/+47
2015-11-04gc: remove garbage .idx files from pack dirDoug Kelly1-1/+1
2015-11-04t5304: test cleaning pack garbageDoug Kelly1-0/+21
2015-11-03Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano1-0/+33
2015-11-03Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano1-1/+3
2015-11-03Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano1-0/+10
2015-11-03Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano1-0/+50
2015-11-03Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano1-0/+12
2015-11-03Merge branch 'js/clone-dissociate' into maintJunio C Hamano1-0/+21
2015-11-03Merge branch 'ld/p4-import-labels' into maintJunio C Hamano1-0/+45
2015-11-03Merge branch 'jk/repository-extension' into maintJunio C Hamano1-0/+60
2015-11-01wt-status: avoid building bogus branch name with detached HEADRené Scharfe1-1/+1
2015-11-01t7060: add test for status --branch on a detached HEADRené Scharfe1-0/+14
2015-10-29difftool: ignore symbolic links in use_wt_fileDavid Aguilar1-0/+19
2015-10-29merge-file: clamp exit code to maximum 127Jeff King1-0/+33
2015-10-28rebase-i: work around Windows CRLF line endingsJunio C Hamano1-1/+1
2015-10-28t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin1-0/+12
2015-10-26merge: detect delete/modechange conflictJeff King1-0/+23
2015-10-26t6031: generalize for recursive and resolve strategiesJeff King2-56/+77
2015-10-26t6031: move triple-rename test to t3030Jeff King2-31/+30
2015-10-24add: simplify -u/-A without pathspecJunio C Hamano2-0/+3
2015-10-20Merge branch 'js/gc-with-stale-symref' into maintJunio C Hamano1-0/+13
2015-10-20Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano1-0/+14
2015-10-19t7063: fix flaky untracked-cache testDavid Turner1-1/+3
2015-10-16Merge branch 'es/worktree-add-cleanup' into maintJunio C Hamano1-0/+0
2015-10-16Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano1-1/+21
2015-10-16Merge branch 'sb/http-flaky-test-fix' into maintJunio C Hamano3-23/+1
2015-10-16Merge branch 'sb/perf-without-installed-git' into maintJunio C Hamano1-0/+1
2015-10-16Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano1-0/+13
2015-10-16Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano1-0/+15
2015-10-16Merge branch 'jk/notes-dwim-doc' into maintJunio C Hamano1-0/+6