aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* rebase -i: remember merge options beyond continue actionsFabian Ruch2015-12-11
* Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-11
|\
| * t3404: fix quoting of redirect for some versions of bashCharles Bailey2015-12-04
* | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-11
|\ \
| * | test-lib-functions: detect test_when_finished in subshellJohn Keeping2015-09-08
| * | t7800: don't use test_config in a subshellJohn Keeping2015-09-08
| * | test-lib-functions: support "test_config -C <dir> ..."John Keeping2015-09-08
| * | t5801: don't use test_when_finished in a subshellJohn Keeping2015-09-08
| * | t7610: don't use test_config in a subshellJohn Keeping2015-09-08
* | | 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: test dirty index and worktree while on an orphan branchSZEDER Gábor2015-11-24
* | | | Merge branch 'jk/rebase-no-autostash' into maintJunio C Hamano2015-12-08
|\ \ \ \
| * | | | rebase: support --no-autostashJohn Keeping2015-09-10
* | | | | 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
* | | | | | 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 'ld/p4-detached-head' into maintJeff King2015-12-01
|\ \ \ \ \ \ \
| * | | | | | | git-p4: work with a detached headLuke 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 'dk/t5813-unc-paths' into maintJeff King2015-12-01
|\ \ \ \ \ \ \ \
| * | | | | | | | t5813: avoid creating urls that break on cygwinDennis Kaarsemaker2015-11-20
| |/ / / / / / /
* | | | | | | | allow hooks to ignore their standard input streamClemens Buchacher2015-11-16
|/ / / / / / /
* | | | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano2015-11-05
|\ \ \ \ \ \ \
| * | | | | | | wt-status: avoid building bogus branch name with detached HEADRené Scharfe2015-11-01
| * | | | | | | t7060: add test for status --branch on a detached HEADRené Scharfe2015-11-01
* | | | | | | | Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-05
|\ \ \ \ \ \ \ \
| * | | | | | | | add: simplify -u/-A without pathspecJunio C Hamano2015-10-24
* | | | | | | | | Merge branch 'jk/delete-modechange-conflict' into maintJunio C Hamano2015-11-05
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge: detect delete/modechange conflictJeff King2015-10-26
| * | | | | | | | | t6031: generalize for recursive and resolve strategiesJeff King2015-10-26
| * | | | | | | | | t6031: move triple-rename test to t3030Jeff King2015-10-26
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-05
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: allow --local from a linked checkoutNguyễn Thái Ngọc Duy2015-09-28
| * | | | | | | | | enter_repo: allow .git files in strict modeNguyễn Thái Ngọc Duy2015-09-28
| * | | | | | | | | enter_repo: avoid duplicating logic, use is_git_directory() insteadNguyễn Thái Ngọc Duy2015-09-28
| * | | | | | | | | t0002: add test for enter_repo(), non-strict modeNguyễn Thái Ngọc Duy2015-09-28
* | | | | | | | | | Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-file: clamp exit code to maximum 127Jeff King2015-10-29
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7063: fix flaky untracked-cache testDavid Turner2015-10-19
* | | | | | | | | | | Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | path: implement common_dir handling in git_pathdup_submodule()Max Kirillov2015-09-14
* | | | | | | | | | | | Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \