summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-033-1/+38
|\
| * merge-file: clamp exit code to maximum 127jk/merge-file-exit-codeJeff King2015-10-293-1/+38
* | Merge branch 'dt/name-hash-dir-entry-fix' into maintJunio C Hamano2015-11-034-60/+35
|\ \
| * | name-hash: don't reuse cache_entry in dir_entrydt/name-hash-dir-entry-fixDavid Turner2015-10-214-60/+35
* | | Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-031-16/+33
|\ \ \
| * | | am -3: do not let failed merge from completing the error codepathjc/am-3-fallback-regression-fixJunio C Hamano2015-10-091-16/+33
* | | | Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-0325-41/+64
|\ \ \ \
| * | | | usage: do not insist that standard input must come from a filejc/usage-stdinJunio C Hamano2015-10-1625-41/+64
* | | | | Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-032-3/+3
|\ \ \ \ \
| * | | | | am, credential-cache: add angle brackets to usage stringrt/placeholder-in-usageRalf Thielow2015-10-162-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'dt/t7063-fix-flaky-test' into maintJunio C Hamano2015-11-031-1/+3
|\ \ \ \ \
| * | | | | t7063: fix flaky untracked-cache testdt/t7063-fix-flaky-testDavid Turner2015-10-191-1/+3
* | | | | | Merge branch 'mk/submodule-gitdir-path' into maintJunio C Hamano2015-11-035-17/+42
|\ \ \ \ \ \
| * | | | | | path: implement common_dir handling in git_pathdup_submodule()mk/submodule-gitdir-pathMax Kirillov2015-09-144-9/+41
| * | | | | | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()Max Kirillov2015-09-141-8/+1
* | | | | | | Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-031-1/+55
|\ \ \ \ \ \ \
| * | | | | | | gc: save log from daemonized gc --auto and print it next timend/gc-auto-background-fixNguyễn Thái Ngọc Duy2015-09-211-1/+55
* | | | | | | | Merge branch 'ls/p4-translation-failure' into maintJunio C Hamano2015-11-032-11/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: handle "Translation of file content failed"ls/p4-translation-failureLars Schneider2015-09-222-12/+17
| * | | | | | | | git-p4: add test case for "Translation of file content failed" errorLars Schneider2015-09-221-0/+50
* | | | | | | | | Merge branch 'gr/rebase-i-drop-warn' into maintJunio C Hamano2015-11-032-0/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase-i: work around Windows CRLF line endingsgr/rebase-i-drop-warnJunio C Hamano2015-10-282-1/+13
| * | | | | | | | | t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endingsJohannes Schindelin2015-10-281-0/+12
* | | | | | | | | | Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-034-23/+62
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone --dissociate: avoid locking pack filesjs/clone-dissociateJohannes Schindelin2015-10-072-2/+4
| * | | | | | | | | | sha1_file.c: add a function to release all packsJohannes Schindelin2015-10-072-3/+21
| * | | | | | | | | | sha1_file: consolidate code to close a pack's file descriptorJohannes Schindelin2015-10-051-20/+18
| * | | | | | | | | | t5700: demonstrate a Windows file locking issue with `git clone --dissociate`Johannes Schindelin2015-10-051-0/+21
* | | | | | | | | | | Merge branch 'ld/p4-import-labels' into maintJunio C Hamano2015-11-032-8/+62
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: fix P4 label import for unprocessed commitsld/p4-import-labelsLuke Diamand2015-08-282-9/+18
| * | | | | | | | | | | git-p4: do not terminate creating tag for unknown commitLuke Diamand2015-08-281-2/+2
| * | | | | | | | | | | git-p4: failing test for ignoring invalid p4 labelsLuke Diamand2015-08-281-0/+45
* | | | | | | | | | | | Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-039-103/+118
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | stripspace: use parse-options for command-line parsingtk/stripspaceTobias Klauser2015-10-161-26/+31
| * | | | | | | | | | | | strbuf: make stripspace() part of strbufTobias Klauser2015-10-169-78/+88
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-038-12/+209
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | introduce "preciousObjects" repository extensionjk/repository-extensionJeff King2015-06-248-9/+50
| * | | | | | | | | | | | introduce "extensions" form of core.repositoryformatversionJeff King2015-06-244-3/+159
* | | | | | | | | | | | | Merge branch 'js/gc-with-stale-symref' into maintJunio C Hamano2015-10-202-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pack-objects: do not get distracted by broken symrefsjs/gc-with-stale-symrefJohannes Schindelin2015-10-082-2/+8
| * | | | | | | | | | | | | gc: demonstrate failure with stale remote HEADJohannes Schindelin2015-10-051-0/+13
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rd/test-path-utils' into maintJunio C Hamano2015-10-202-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | test-path-utils.c: remove incorrect assumptionrd/test-path-utilsRay Donnelly2015-10-082-2/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/doc-gc-prune-now' into maintJunio C Hamano2015-10-201-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/gc: warn against --prune=<now>jc/doc-gc-prune-nowJunio C Hamano2015-10-141-2/+5
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-10-202-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | filter-branch: remove multi-line headers in msg filterjk/filter-branch-use-of-sed-on-incomplete-lineJames McCoy2015-10-122-1/+15
* | | | | | | | | | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-po into maintJunio C Hamano2015-10-181-1583/+1967
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2015-09-301-1583/+1967
* | | | | | | | | | | | | | Git 2.6.2v2.6.2Junio C Hamano2015-10-164-3/+69
View Lorry Controller Status