aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: handle "Translation of file content failed"Lars Schneider2015-09-22
| * | | | | | | | | git-p4: add test case for "Translation of file content failed" errorLars Schneider2015-09-22
* | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase-i: work around Windows CRLF line endingsJunio C Hamano2015-10-28
| * | | | | | | | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-10-28
* | | | | | | | | | | Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clone --dissociate: avoid locking pack filesJohannes Schindelin2015-10-07
| * | | | | | | | | | | t5700: demonstrate a Windows file locking issue with `git clone --dissociate`Johannes Schindelin2015-10-05
* | | | | | | | | | | | Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-p4: fix P4 label import for unprocessed commitsLuke Diamand2015-08-28
| * | | | | | | | | | | | git-p4: failing test for ignoring invalid p4 labelsLuke Diamand2015-08-28
* | | | | | | | | | | | | Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | introduce "preciousObjects" repository extensionJeff King2015-06-24
| * | | | | | | | | | | | introduce "extensions" form of core.repositoryformatversionJeff King2015-06-24
* | | | | | | | | | | | | Merge branch 'js/gc-with-stale-symref' into maintJunio C Hamano2015-10-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pack-objects: do not get distracted by broken symrefsJohannes Schindelin2015-10-08
| * | | | | | | | | | | | | gc: demonstrate failure with stale remote HEADJohannes Schindelin2015-10-05
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-10-20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | filter-branch: remove multi-line headers in msg filterJames McCoy2015-10-12