aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* 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
* | | | | | | | | Merge branch 'es/worktree-add-cleanup' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t2026: rename worktree prune testMichael J Gruber2015-10-07
* | | | | | | | | | Merge branch 'jc/fsck-dropped-errors' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fsck: exit with non-zero when problems are foundJunio C Hamano2015-09-23
* | | | | | | | | | | Merge branch 'sb/http-flaky-test-fix' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5561: get rid of racy appending to logfileStephan Beyer2015-09-25
* | | | | | | | | | | | Merge branch 'sb/perf-without-installed-git' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t/perf: make runner work even if Git is not installedStephan Beyer2015-09-25
* | | | | | | | | | | | | Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | status: don't say 'HEAD detached at HEAD'Matthieu Moy2015-10-02
| * | | | | | | | | | | | | t3203: test 'detached at' after checkout --detachMatthieu Moy2015-10-02
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | rebase-i: loosen over-eager check_bad_cmd checkMatthieu Moy2015-10-05
* | | | | | | | | | | | | Merge branch 'jk/notes-dwim-doc' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | notes: correct documentation of DWIMery for notes referencesJacob Keller2015-09-22
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/connect-clear-env' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git_connect: clear GIT_* environment for sshJeff King2015-09-04
* | | | | | | | | | | | | | Merge branch 'jk/blame-first-parent' into maintJunio C Hamano2015-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | blame: handle --first-parentJeff King2015-09-16
* | | | | | | | | | | | | | | Sync with v2.5.4Junio C Hamano2015-09-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Sync with 2.4.10Junio C Hamano2015-09-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Sync with 2.3.10Junio C Hamano2015-09-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | http: limit redirection depthBlake Burkhart2015-09-25
| | | * | | | | | | | | | | | http: limit redirection to protocol-whitelistBlake Burkhart2015-09-25
| | | * | | | | | | | | | | | submodule: allow only certain protocols for submodule fetchesJeff King2015-09-23
| | | * | | | | | | | | | | | transport: add a protocol-whitelist environment variableJeff King2015-09-23