Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-test | David Turner | 2015-10-19 | 1 | -1/+3 | |
* | | | | | | | | | | | Merge branch 'mk/submodule-gitdir-path' into maint | Junio C Hamano | 2015-11-03 | 5 | -17/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-path | Max Kirillov | 2015-09-14 | 4 | -9/+41 | |
| * | | | | | | | | | | | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() | Max Kirillov | 2015-09-14 | 1 | -8/+1 | |
* | | | | | | | | | | | | Merge branch 'nd/gc-auto-background-fix' into maint | Junio C Hamano | 2015-11-03 | 1 | -1/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | gc: save log from daemonized gc --auto and print it next timend/gc-auto-background-fix | Nguyễn Thái Ngọc Duy | 2015-09-21 | 1 | -1/+55 | |
* | | | | | | | | | | | | | Merge branch 'ls/p4-translation-failure' into maint | Junio C Hamano | 2015-11-03 | 2 | -11/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git-p4: handle "Translation of file content failed"ls/p4-translation-failure | Lars Schneider | 2015-09-22 | 2 | -12/+17 | |
| * | | | | | | | | | | | | | git-p4: add test case for "Translation of file content failed" error | Lars Schneider | 2015-09-22 | 1 | -0/+50 | |
* | | | | | | | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' into maint | Junio C Hamano | 2015-11-03 | 2 | -0/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warn | Junio C Hamano | 2015-10-28 | 2 | -1/+13 | |
| * | | | | | | | | | | | | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings | Johannes Schindelin | 2015-10-28 | 1 | -0/+12 | |
* | | | | | | | | | | | | | | | Merge branch 'js/clone-dissociate' into maint | Junio C Hamano | 2015-11-03 | 4 | -23/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | clone --dissociate: avoid locking pack filesjs/clone-dissociate | Johannes Schindelin | 2015-10-07 | 2 | -2/+4 | |
| * | | | | | | | | | | | | | | | sha1_file.c: add a function to release all packs | Johannes Schindelin | 2015-10-07 | 2 | -3/+21 | |
| * | | | | | | | | | | | | | | | sha1_file: consolidate code to close a pack's file descriptor | Johannes Schindelin | 2015-10-05 | 1 | -20/+18 | |
| * | | | | | | | | | | | | | | | t5700: demonstrate a Windows file locking issue with `git clone --dissociate` | Johannes Schindelin | 2015-10-05 | 1 | -0/+21 | |
* | | | | | | | | | | | | | | | | Merge branch 'ld/p4-import-labels' into maint | Junio C Hamano | 2015-11-03 | 2 | -8/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | git-p4: fix P4 label import for unprocessed commitsld/p4-import-labels | Luke Diamand | 2015-08-28 | 2 | -9/+18 | |
| * | | | | | | | | | | | | | | | | git-p4: do not terminate creating tag for unknown commit | Luke Diamand | 2015-08-28 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | git-p4: failing test for ignoring invalid p4 labels | Luke Diamand | 2015-08-28 | 1 | -0/+45 | |
* | | | | | | | | | | | | | | | | | Merge branch 'tk/stripspace' into maint | Junio C Hamano | 2015-11-03 | 9 | -103/+118 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | stripspace: use parse-options for command-line parsingtk/stripspace | Tobias Klauser | 2015-10-16 | 1 | -26/+31 | |
| * | | | | | | | | | | | | | | | | | strbuf: make stripspace() part of strbuf | Tobias Klauser | 2015-10-16 | 9 | -78/+88 | |
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'jk/repository-extension' into maint | Junio C Hamano | 2015-11-03 | 8 | -12/+209 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | introduce "preciousObjects" repository extensionjk/repository-extension | Jeff King | 2015-06-24 | 8 | -9/+50 | |
| * | | | | | | | | | | | | | | | | | introduce "extensions" form of core.repositoryformatversion | Jeff King | 2015-06-24 | 4 | -3/+159 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'js/gc-with-stale-symref' into maint | Junio C Hamano | 2015-10-20 | 2 | -1/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symref | Johannes Schindelin | 2015-10-08 | 2 | -2/+8 | |
| * | | | | | | | | | | | | | | | | | | gc: demonstrate failure with stale remote HEAD | Johannes Schindelin | 2015-10-05 | 1 | -0/+13 | |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'rd/test-path-utils' into maint | Junio C Hamano | 2015-10-20 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | test-path-utils.c: remove incorrect assumptionrd/test-path-utils | Ray Donnelly | 2015-10-08 | 2 | -2/+5 | |
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-gc-prune-now' into maint | Junio C Hamano | 2015-10-20 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Documentation/gc: warn against --prune=<now>jc/doc-gc-prune-now | Junio C Hamano | 2015-10-14 | 1 | -2/+5 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint | Junio C Hamano | 2015-10-20 | 2 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | filter-branch: remove multi-line headers in msg filterjk/filter-branch-use-of-sed-on-incomplete-line | James McCoy | 2015-10-12 | 2 | -1/+15 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2015-10-18 | 1 | -1583/+1967 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2015-09-30 | 1 | -1583/+1967 | |
* | | | | | | | | | | | | | | | | | | | Git 2.6.2v2.6.2 | Junio C Hamano | 2015-10-16 | 4 | -3/+69 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'cc/quote-comments' into maint | Junio C Hamano | 2015-10-16 | 1 | -5/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | quote: move comment before sq_quote_buf()cc/quote-comments | Christian Couder | 2015-10-07 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | | | | | | | quote: fix broken sq_quote_buf() related comment | Christian Couder | 2015-10-07 | 1 | -0/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'es/worktree-add-cleanup' into maint | Junio C Hamano | 2015-10-16 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | t2026: rename worktree prune testes/worktree-add-cleanup | Michael J Gruber | 2015-10-07 | 1 | -0/+0 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'tk/doc-interpret-trailers-grammo' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Documentation/interpret-trailers: Grammar fixtk/doc-interpret-trailers-grammo | Tobias Klauser | 2015-10-07 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tk/typofix-connect-unknown-proto-error' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | connect: fix typo in result string of prot_name()tk/typofix-connect-unknown-proto-error | Tobias Klauser | 2015-09-25 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint | Junio C Hamano | 2015-10-16 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Documentation: fix section header mark-upjk/asciidoctor-section-heading-markup-fix | John Keeping | 2015-09-25 | 2 | -2/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |