aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-04
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | worktree: usage: denote <branch> as optional with 'add'Sidhant Sharma2015-10-18
* | | | | | | | | | | | | Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | blame: fix option name in error messageMax Kirillov2015-10-26
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | merge-file: clamp exit code to maximum 127Jeff King2015-10-29
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dt/name-hash-dir-entry-fix' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | name-hash: don't reuse cache_entry in dir_entryDavid Turner2015-10-21
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am -3: do not let failed merge from completing the error codepathJunio C Hamano2015-10-09
* | | | | | | | | | | | | | Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | usage: do not insist that standard input must come from a fileJunio C Hamano2015-10-16
* | | | | | | | | | | | | | | Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am, credential-cache: add angle brackets to usage stringRalf Thielow2015-10-16
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()Max Kirillov2015-09-14
* | | | | | | | | | | | | | | | | Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | gc: save log from daemonized gc --auto and print it next timeNguyễn Thái Ngọc Duy2015-09-21
* | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | sha1_file.c: add a function to release all packsJohannes Schindelin2015-10-07
| * | | | | | | | | | | | | | | | | | | | sha1_file: consolidate code to close a pack's file descriptorJohannes Schindelin2015-10-05
| * | | | | | | | | | | | | | | | | | | | 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: do not terminate creating tag for unknown commitLuke Diamand2015-08-28
| * | | | | | | | | | | | | | | | | | | | | git-p4: failing test for ignoring invalid p4 labelsLuke Diamand2015-08-28
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | stripspace: use parse-options for command-line parsingTobias Klauser2015-10-16
| * | | | | | | | | | | | | | | | | | | | | | strbuf: make stripspace() part of strbufTobias Klauser2015-10-16
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | 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 'rd/test-path-utils' into maintJunio C Hamano2015-10-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | test-path-utils.c: remove incorrect assumptionRay Donnelly2015-10-08
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/doc-gc-prune-now' into maintJunio C Hamano2015-10-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Documentation/gc: warn against --prune=<now>Junio C Hamano2015-10-14
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maintJunio C Hamano2015-10-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \