Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rs/grep-color-words' | Junio C Hamano | 2014-10-31 |
|\ | |||
| * | grep: add color.grep.matchcontext and color.grep.matchselected | René Scharfe | 2014-10-28 |
* | | Merge branch 'da/difftool' | Junio C Hamano | 2014-10-29 |
|\ \ | |||
| * | | difftool: add support for --trust-exit-code | David Aguilar | 2014-10-28 |
| * | | difftool--helper: exit when reading a prompt answer fails | Johannes Sixt | 2014-10-27 |
| * | | Merge branch 'jk/mbox-from-line' into maint | Junio C Hamano | 2014-10-07 |
| |\ \ | |||
| * \ \ | Merge branch 'jk/fsck-exit-code-fix' into maint | Junio C Hamano | 2014-09-29 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'ta/config-add-to-empty-or-true-fix' into maint | Junio C Hamano | 2014-09-29 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'mk/reachable-protect-detached-head' into maint | Junio C Hamano | 2014-09-29 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'mb/fast-import-delete-root' into maint | Junio C Hamano | 2014-09-29 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/send-pack-many-refspecs' into maint | Junio C Hamano | 2014-09-29 |
| |\ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ | Merge branch 'mg/lib-gpg-ro-safety' | Junio C Hamano | 2014-10-29 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t/lib-gpg: make gpghome files writable | Michael J Gruber | 2014-10-27 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jk/prune-mtime' | Junio C Hamano | 2014-10-29 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | repack: pack objects mentioned by the index | Jeff King | 2014-10-19 |
| * | | | | | | | | | rev-list: add --indexed-objects option | Jeff King | 2014-10-19 |
| * | | | | | | | | | t5516: test pushing a tag of an otherwise unreferenced blob | Jeff King | 2014-10-19 |
| * | | | | | | | | | write_sha1_file: freshen existing objects | Jeff King | 2014-10-16 |
| * | | | | | | | | | pack-objects: match prune logic for discarding objects | Jeff King | 2014-10-16 |
| * | | | | | | | | | prune: keep objects reachable from recent objects | Jeff King | 2014-10-16 |
* | | | | | | | | | | Merge branch 'jc/push-cert' | Junio C Hamano | 2014-10-24 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | push: heed user.signingkey for signed pushes | Michael J Gruber | 2014-10-24 |
* | | | | | | | | | | | Merge branch 'wk/t1304-wo-USER' | Junio C Hamano | 2014-10-24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t1304: Set LOGNAME even if USER is unset or null | W. Trevor King | 2014-10-19 |
* | | | | | | | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' | Junio C Hamano | 2014-10-24 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | pack-objects: turn off bitmaps when we split packs | Jeff King | 2014-10-19 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'da/mergetool-temporary-directory' | Junio C Hamano | 2014-10-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | t7610-mergetool: add test cases for mergetool.writeToTemp | David Aguilar | 2014-10-16 |
* | | | | | | | | | | | | | Merge branch 'da/mergetool-tool-help' | Junio C Hamano | 2014-10-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | test-lib-functions: adjust style to match CodingGuidelines | David Aguilar | 2014-10-15 |
| * | | | | | | | | | | | | | t7610-mergetool: prefer test_config over git config | David Aguilar | 2014-10-15 |
* | | | | | | | | | | | | | | Merge branch 'da/mergetool-tests' | Junio C Hamano | 2014-10-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | test-lib-functions: adjust style to match CodingGuidelines | David Aguilar | 2014-10-16 |
| * | | | | | | | | | | | | | t7610-mergetool: use test_config to isolate tests | David Aguilar | 2014-10-16 |
| |/ / / / / / / / / / / / | |||
| * | | | | | | | | | | | | t7610-mergetool: add missing && and remove commented-out code | David Aguilar | 2014-10-15 |
| * | | | | | | | | | | | | t7610-mergetool: use tabs instead of a mix of tabs and spaces | David Aguilar | 2014-10-15 |
| |/ / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge branch 'rs/ref-transaction' | Junio C Hamano | 2014-10-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | refs.c: allow listing and deleting badly named refs | Ronnie Sahlberg | 2014-10-15 |
| * | | | | | | | | | | | | test: put tests for handling of bad ref names in one place | Ronnie Sahlberg | 2014-10-15 |
| * | | | | | | | | | | | | branch -d: avoid repeated symref resolution | Jonathan Nieder | 2014-10-15 |
| * | | | | | | | | | | | | reflog test: test interaction with detached HEAD | Junio C Hamano | 2014-10-15 |
| * | | | | | | | | | | | | mv test: recreate mod/ directory instead of relying on stale copy | Jonathan Nieder | 2014-10-15 |
* | | | | | | | | | | | | | Merge branch 'cc/interpret-trailers' | Junio C Hamano | 2014-10-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | trailer: add tests for commands in config file | Christian Couder | 2014-10-13 |
| * | | | | | | | | | | | | | trailer: add tests for "git interpret-trailers" | Christian Couder | 2014-10-13 |
* | | | | | | | | | | | | | | Merge branch 'ta/config-set' | Junio C Hamano | 2014-10-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | t1308: fix broken here document in test script | Junio C Hamano | 2014-10-13 |
* | | | | | | | | | | | | | | | Merge branch 'jk/test-shell-trace' | Junio C Hamano | 2014-10-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | test-lib.sh: support -x option for shell-tracing | Jeff King | 2014-10-13 |
| * | | | | | | | | | | | | | | t5304: use helper to report failure of "test foo = bar" | Jeff King | 2014-10-13 |