Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da/difftool' | Junio C Hamano | 2014-11-18 | 1 | -0/+5 |
|\ | |||||
| * | difftool: honor --trust-exit-code for builtin tools | David Aguilar | 2014-11-14 | 1 | -0/+5 |
* | | Merge branch 'jk/fetch-reflog-df-conflict' | Junio C Hamano | 2014-11-12 | 1 | -18/+18 |
|\ \ | |||||
| * | | t1410: fix breakage on case-insensitive filesystemsjk/fetch-reflog-df-conflict | Jeff King | 2014-11-10 | 1 | -18/+18 |
* | | | Merge branch 'tm/line-log-first-parent' | Junio C Hamano | 2014-11-06 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | line-log: fix crash when --first-parent is usedtm/line-log-first-parent | Tzvetan Mikov | 2014-11-04 | 1 | -0/+5 |
* | | | | Merge branch 'jk/fetch-reflog-df-conflict' | Junio C Hamano | 2014-11-06 | 2 | -0/+74 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | ignore stale directories when checking reflog existence | Jeff King | 2014-11-04 | 1 | -0/+34 |
| * | | | fetch: load all default config at startup | Jeff King | 2014-11-04 | 1 | -0/+40 |
* | | | | Merge branch 'rs/grep-color-words' | Junio C Hamano | 2014-10-31 | 1 | -0/+94 |
|\ \ \ \ | |||||
| * | | | | grep: add color.grep.matchcontext and color.grep.matchselectedrs/grep-color-words | René Scharfe | 2014-10-28 | 1 | -0/+94 |
* | | | | | Merge branch 'da/difftool' | Junio C Hamano | 2014-10-29 | 1 | -0/+51 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | difftool: add support for --trust-exit-code | David Aguilar | 2014-10-28 | 1 | -0/+43 |
| * | | | | difftool--helper: exit when reading a prompt answer fails | Johannes Sixt | 2014-10-27 | 1 | -0/+8 |
| * | | | | Merge branch 'jk/mbox-from-line' into maint | Junio C Hamano | 2014-10-07 | 5 | -0/+49 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/fsck-exit-code-fix' into maint | Junio C Hamano | 2014-09-29 | 2 | -7/+83 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'ta/config-add-to-empty-or-true-fix' into maint | Junio C Hamano | 2014-09-29 | 1 | -0/+20 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'mk/reachable-protect-detached-head' into maint | Junio C Hamano | 2014-09-29 | 1 | -0/+22 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'mb/fast-import-delete-root' into maint | Junio C Hamano | 2014-09-29 | 1 | -0/+104 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/send-pack-many-refspecs' into maint | Junio C Hamano | 2014-09-29 | 2 | -0/+107 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'mg/lib-gpg-ro-safety' | Junio C Hamano | 2014-10-29 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t/lib-gpg: make gpghome files writablemg/lib-gpg-ro-safety | Michael J Gruber | 2014-10-27 | 1 | -0/+1 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/prune-mtime' | Junio C Hamano | 2014-10-29 | 4 | -0/+181 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | repack: pack objects mentioned by the index | Jeff King | 2014-10-19 | 1 | -0/+13 |
| * | | | | | | | | | | | rev-list: add --indexed-objects option | Jeff King | 2014-10-19 | 1 | -0/+23 |
| * | | | | | | | | | | | t5516: test pushing a tag of an otherwise unreferenced blob | Jeff King | 2014-10-19 | 1 | -0/+13 |
| * | | | | | | | | | | | write_sha1_file: freshen existing objects | Jeff King | 2014-10-16 | 1 | -0/+27 |
| * | | | | | | | | | | | pack-objects: match prune logic for discarding objects | Jeff King | 2014-10-16 | 1 | -38/+55 |
| * | | | | | | | | | | | prune: keep objects reachable from recent objects | Jeff King | 2014-10-16 | 1 | -0/+88 |
* | | | | | | | | | | | | Merge branch 'jc/push-cert' | Junio C Hamano | 2014-10-24 | 1 | -0/+44 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | push: heed user.signingkey for signed pushes | Michael J Gruber | 2014-10-24 | 1 | -0/+44 |
* | | | | | | | | | | | | | Merge branch 'wk/t1304-wo-USER' | Junio C Hamano | 2014-10-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t1304: Set LOGNAME even if USER is unset or nullwk/t1304-wo-USER | W. Trevor King | 2014-10-19 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch 'jk/pack-objects-no-bitmap-when-splitting' | Junio C Hamano | 2014-10-24 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | pack-objects: turn off bitmaps when we split packsjk/pack-objects-no-bitmap-when-splitting | Jeff King | 2014-10-19 | 1 | -0/+9 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'da/mergetool-temporary-directory' | Junio C Hamano | 2014-10-21 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | t7610-mergetool: add test cases for mergetool.writeToTempda/mergetool-temporary-directory | David Aguilar | 2014-10-16 | 1 | -0/+23 |
* | | | | | | | | | | | | | | Merge branch 'da/mergetool-tool-help' | Junio C Hamano | 2014-10-21 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | test-lib-functions: adjust style to match CodingGuidelines | David Aguilar | 2014-10-15 | 1 | -12/+18 |
| * | | | | | | | | | | | | | | t7610-mergetool: prefer test_config over git config | David Aguilar | 2014-10-15 | 1 | -11/+9 |
* | | | | | | | | | | | | | | | Merge branch 'da/mergetool-tests' | Junio C Hamano | 2014-10-21 | 2 | -471/+469 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | test-lib-functions: adjust style to match CodingGuidelinesda/mergetool-tests | David Aguilar | 2014-10-16 | 1 | -12/+18 |
| * | | | | | | | | | | | | | | t7610-mergetool: use test_config to isolate tests | David Aguilar | 2014-10-16 | 1 | -5/+3 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | t7610-mergetool: add missing && and remove commented-out code | David Aguilar | 2014-10-15 | 1 | -8/+2 |
| * | | | | | | | | | | | | | t7610-mergetool: use tabs instead of a mix of tabs and spaces | David Aguilar | 2014-10-15 | 1 | -459/+459 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'rs/ref-transaction' | Junio C Hamano | 2014-10-21 | 6 | -71/+322 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | refs.c: allow listing and deleting badly named refs | Ronnie Sahlberg | 2014-10-15 | 1 | -1/+124 |
| * | | | | | | | | | | | | | test: put tests for handling of bad ref names in one place | Ronnie Sahlberg | 2014-10-15 | 3 | -74/+84 |
| * | | | | | | | | | | | | | branch -d: avoid repeated symref resolution | Jonathan Nieder | 2014-10-15 | 2 | -0/+43 |
| * | | | | | | | | | | | | | reflog test: test interaction with detached HEAD | Junio C Hamano | 2014-10-15 | 1 | -0/+70 |