Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'ls/p4-keep-empty-commits' | Junio C Hamano | 2015-12-15 |
|\ | |||
| * | git-p4: add option to keep empty commits | Lars Schneider | 2015-12-10 |
* | | Merge branch 'cb/t3404-shellquote' | Junio C Hamano | 2015-12-11 |
|\ \ | |||
| * | | t3404: fix quoting of redirect for some versions of bash | Charles Bailey | 2015-12-04 |
* | | | Merge branch 'ls/test-must-fail-sigpipe' | Junio C Hamano | 2015-12-08 |
|\ \ \ | |||
| * | | | add "ok=sigpipe" to test_must_fail and use it to fix flaky tests | Lars Schneider | 2015-11-28 |
| * | | | implement test_might_fail using a refactored test_must_fail | Lars Schneider | 2015-11-28 |
* | | | | Merge branch 'sg/bash-prompt-dirty-orphan' | Junio C Hamano | 2015-12-04 |
|\ \ \ \ | |||
| * | | | | bash prompt: indicate dirty index even on orphan branches | SZEDER Gábor | 2015-11-24 |
| * | | | | bash prompt: test dirty index and worktree while on an orphan branch | SZEDER Gábor | 2015-11-24 |
* | | | | | Merge branch 'jk/send-email-complete-aliases' | Junio C Hamano | 2015-12-04 |
|\ \ \ \ \ | |||
| * | | | | | sendemail: teach git-send-email to dump alias names | Jacob Keller | 2015-11-20 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'jk/filter-branch-no-index' | Junio C Hamano | 2015-12-04 |
|\ \ \ \ \ | |||
| * | | | | | filter-branch: skip index read/write when possible | Jeff King | 2015-11-06 |
* | | | | | | Merge branch 'mk/blame-first-parent' | Jeff King | 2015-12-01 |
|\ \ \ \ \ \ | |||
| * | | | | | | blame: fix object casting regression | Jeff King | 2015-11-24 |
* | | | | | | | Merge branch 'rs/fsck-nul-header' | Jeff King | 2015-12-01 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | fsck: treat a NUL in a tag header as an error | René Scharfe | 2015-11-20 |
| * | | | | | | | t1450: add tests for NUL in headers of commits and tags | René Scharfe | 2015-11-20 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'ls/p4-test-timeouts' | Jeff King | 2015-12-01 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | git-p4: add trap to kill p4d on test exit | Lars Schneider | 2015-11-20 |
| * | | | | | | | git-p4: add p4d timeout in tests | Lars Schneider | 2015-11-20 |
| * | | | | | | | git-p4: retry kill/cleanup operations in tests with timeout | Lars Schneider | 2015-11-20 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'js/test-modernize-t9300' | Jeff King | 2015-12-01 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | modernize t9300: move test preparations into test_expect_success | Johannes Sixt | 2015-11-20 |
| * | | | | | | | modernize t9300: mark here-doc words to ignore tab indentation | Johannes Sixt | 2015-11-20 |
| * | | | | | | | modernize t9300: use test_when_finished for clean-up | Johannes Sixt | 2015-11-20 |
| * | | | | | | | modernize t9300: wrap lines after && | Johannes Sixt | 2015-11-20 |
| * | | | | | | | modernize t9300: use test_must_be_empty | Johannes Sixt | 2015-11-20 |
| * | | | | | | | modernize t9300: use test_must_fail | Johannes Sixt | 2015-11-20 |
| * | | | | | | | modernize t9300: single-quote placement and indentation | Johannes Sixt | 2015-11-20 |
| |/ / / / / / | |||
* | | | | | | | Merge branch 'maint' | Jeff King | 2015-12-01 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||
| * | | | | | | Merge branch 'eg/p4-submit-catch-failure' into maint | Jeff King | 2015-12-01 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | git-p4: clean up after p4 submit failure | GIRARD Etienne | 2015-11-24 |
| * | | | | | | | Merge branch 'ld/p4-detached-head' into maint | Jeff King | 2015-12-01 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | git-p4: work with a detached head | Luke Diamand | 2015-11-24 |
| | * | | | | | | | git-p4: add failing test for submit from detached head | Luke Diamand | 2015-11-24 |
| * | | | | | | | | Merge branch 'sg/filter-branch-dwim-ambiguity' into maint | Jeff King | 2015-12-01 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | filter-branch: deal with object name vs. pathname ambiguity in tree-filter | SZEDER Gábor | 2015-11-24 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||
| * | | | | | | | | Merge branch 'dk/t5813-unc-paths' into maint | Jeff King | 2015-12-01 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | t5813: avoid creating urls that break on cygwin | Dennis Kaarsemaker | 2015-11-20 |
| | |/ / / / / / / | |||
| * | | | | | | | | allow hooks to ignore their standard input stream | Clemens Buchacher | 2015-11-16 |
| |/ / / / / / / | |||
| * | | | | | | | Merge branch 'rs/wt-status-detached-branch-fix' into maint | Junio C Hamano | 2015-11-05 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jc/add-u-A-default-to-top' into maint | Junio C Hamano | 2015-11-05 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/delete-modechange-conflict' into maint | Junio C Hamano | 2015-11-05 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/clone-linked-checkout' into maint | Junio C Hamano | 2015-11-05 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/merge-file-exit-code' into maint | Junio C Hamano | 2015-11-03 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dt/t7063-fix-flaky-test' into maint | Junio C Hamano | 2015-11-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mk/submodule-gitdir-path' into maint | Junio C Hamano | 2015-11-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/p4-translation-failure' into maint | Junio C Hamano | 2015-11-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |