Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 |
|\ | |||
| * | merge-file: clamp exit code to maximum 127 | Jeff King | 2015-10-29 |
* | | Merge branch 'dt/name-hash-dir-entry-fix' into maint | Junio C Hamano | 2015-11-03 |
|\ \ | |||
| * | | name-hash: don't reuse cache_entry in dir_entry | David Turner | 2015-10-21 |
* | | | Merge branch 'jc/am-3-fallback-regression-fix' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ | |||
| * | | | am -3: do not let failed merge from completing the error codepath | Junio C Hamano | 2015-10-09 |
* | | | | Merge branch 'jc/usage-stdin' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ | |||
| * | | | | usage: do not insist that standard input must come from a file | Junio C Hamano | 2015-10-16 |
* | | | | | Merge branch 'rt/placeholder-in-usage' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ | |||
| * | | | | | am, credential-cache: add angle brackets to usage string | Ralf Thielow | 2015-10-16 |
| | |/ / / | |/| | | | |||
* | | | | | 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 |
| * | | | | | | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() | Max Kirillov | 2015-09-14 |
* | | | | | | | Merge branch 'nd/gc-auto-background-fix' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | gc: save log from daemonized gc --auto and print it next time | Nguyễn Thái Ngọc Duy | 2015-09-21 |
* | | | | | | | | 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 |
| * | | | | | | | | | | sha1_file.c: add a function to release all packs | Johannes Schindelin | 2015-10-07 |
| * | | | | | | | | | | sha1_file: consolidate code to close a pack's file descriptor | Johannes Schindelin | 2015-10-05 |
| * | | | | | | | | | | 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: do not terminate creating tag for unknown commit | Luke Diamand | 2015-08-28 |
| * | | | | | | | | | | | git-p4: failing test for ignoring invalid p4 labels | Luke Diamand | 2015-08-28 |
* | | | | | | | | | | | | Merge branch 'tk/stripspace' into maint | Junio C Hamano | 2015-11-03 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | stripspace: use parse-options for command-line parsing | Tobias Klauser | 2015-10-16 |
| * | | | | | | | | | | | | strbuf: make stripspace() part of strbuf | Tobias Klauser | 2015-10-16 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | 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 'rd/test-path-utils' into maint | Junio C Hamano | 2015-10-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | test-path-utils.c: remove incorrect assumption | Ray Donnelly | 2015-10-08 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'jc/doc-gc-prune-now' into maint | Junio C Hamano | 2015-10-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Documentation/gc: warn against --prune=<now> | Junio C Hamano | 2015-10-14 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | 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 'maint' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2015-10-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2015-09-30 |
* | | | | | | | | | | | | | | Git 2.6.2v2.6.2 | Junio C Hamano | 2015-10-16 |