Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'dt/t7063-fix-flaky-test' into maint | Junio C Hamano | 2015-11-03 |
|\ | |||
| * | t7063: fix flaky untracked-cache test | David Turner | 2015-10-19 |
* | | Merge branch 'mk/submodule-gitdir-path' into maint | Junio C Hamano | 2015-11-03 |
|\ \ | |||
| * | | path: implement common_dir handling in git_pathdup_submodule() | Max Kirillov | 2015-09-14 |
* | | | Merge branch 'ls/p4-translation-failure' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ | |||
| * | | | git-p4: handle "Translation of file content failed" | Lars Schneider | 2015-09-22 |
| * | | | git-p4: add test case for "Translation of file content failed" error | Lars Schneider | 2015-09-22 |
* | | | | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ | |||
| * | | | | rebase-i: work around Windows CRLF line endings | Junio C Hamano | 2015-10-28 |
| * | | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings | Johannes Schindelin | 2015-10-28 |
* | | | | | Merge branch 'js/clone-dissociate' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ | |||
| * | | | | | clone --dissociate: avoid locking pack files | Johannes Schindelin | 2015-10-07 |
| * | | | | | t5700: demonstrate a Windows file locking issue with `git clone --dissociate` | Johannes Schindelin | 2015-10-05 |
* | | | | | | Merge branch 'ld/p4-import-labels' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ | |||
| * | | | | | | git-p4: fix P4 label import for unprocessed commits | Luke Diamand | 2015-08-28 |
| * | | | | | | git-p4: failing test for ignoring invalid p4 labels | Luke Diamand | 2015-08-28 |
* | | | | | | | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | introduce "preciousObjects" repository extension | Jeff King | 2015-06-24 |
| * | | | | | | | introduce "extensions" form of core.repositoryformatversion | Jeff King | 2015-06-24 |
* | | | | | | | | Merge branch 'js/gc-with-stale-symref' into maint | Junio C Hamano | 2015-10-20 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | pack-objects: do not get distracted by broken symrefs | Johannes Schindelin | 2015-10-08 |
| * | | | | | | | | gc: demonstrate failure with stale remote HEAD | Johannes Schindelin | 2015-10-05 |
| | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-10-20 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | filter-branch: remove multi-line headers in msg filter | James McCoy | 2015-10-12 |
* | | | | | | | | | Merge branch 'es/worktree-add-cleanup' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t2026: rename worktree prune test | Michael J Gruber | 2015-10-07 |
* | | | | | | | | | | Merge branch 'jc/fsck-dropped-errors' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | fsck: exit with non-zero when problems are found | Junio C Hamano | 2015-09-23 |
* | | | | | | | | | | | Merge branch 'sb/http-flaky-test-fix' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t5561: get rid of racy appending to logfile | Stephan Beyer | 2015-09-25 |
* | | | | | | | | | | | | Merge branch 'sb/perf-without-installed-git' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | t/perf: make runner work even if Git is not installed | Stephan Beyer | 2015-09-25 |
* | | | | | | | | | | | | | Merge branch 'mm/detach-at-HEAD-reflog' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | status: don't say 'HEAD detached at HEAD' | Matthieu Moy | 2015-10-02 |
| * | | | | | | | | | | | | | t3203: test 'detached at' after checkout --detach | Matthieu Moy | 2015-10-02 |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | rebase-i: loosen over-eager check_bad_cmd check | Matthieu Moy | 2015-10-05 |
* | | | | | | | | | | | | | Merge branch 'jk/notes-dwim-doc' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | notes: correct documentation of DWIMery for notes references | Jacob Keller | 2015-09-22 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'jk/connect-clear-env' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | git_connect: clear GIT_* environment for ssh | Jeff King | 2015-09-04 |
* | | | | | | | | | | | | | | Merge branch 'jk/blame-first-parent' into maint | Junio C Hamano | 2015-10-16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | blame: handle --first-parent | Jeff King | 2015-09-16 |
* | | | | | | | | | | | | | | | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | http: limit redirection depth | Blake Burkhart | 2015-09-25 |
| | | * | | | | | | | | | | | | http: limit redirection to protocol-whitelist | Blake Burkhart | 2015-09-25 |
| | | * | | | | | | | | | | | | submodule: allow only certain protocols for submodule fetches | Jeff King | 2015-09-23 |
| | | * | | | | | | | | | | | | transport: add a protocol-whitelist environment variable | Jeff King | 2015-09-23 |