Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/c-auto-resets-attributes' | Junio C Hamano | 2016-10-06 | 1 | -1/+1 |
|\ | |||||
| * | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributes | René Scharfe | 2016-09-29 | 1 | -1/+1 |
* | | Merge branch 'vn/revision-shorthand-for-side-branch-log' | Junio C Hamano | 2016-10-06 | 1 | -0/+94 |
|\ \ | |||||
| * | | revision: new rev^-n shorthand for rev^n..rev | Vegard Nossum | 2016-09-27 | 1 | -0/+94 |
* | | | Merge branch 'jk/ambiguous-short-object-names' | Junio C Hamano | 2016-10-06 | 2 | -1/+72 |
|\ \ \ | |||||
| * | | | get_short_sha1: make default disambiguation configurable | Jeff King | 2016-09-27 | 1 | -0/+14 |
| * | | | get_short_sha1: list ambiguous objects on error | Jeff King | 2016-09-26 | 1 | -0/+24 |
| * | | | for_each_abbrev: drop duplicate objects | Jeff King | 2016-09-26 | 1 | -0/+7 |
| * | | | sha1_array: let callbacks interrupt iteration | Jeff King | 2016-09-26 | 1 | -1/+2 |
| * | | | get_short_sha1: parse tags when looking for treeish | Jeff King | 2016-09-26 | 1 | -0/+7 |
| * | | | get_sha1: propagate flags to child functions | Jeff King | 2016-09-26 | 1 | -1/+13 |
| * | | | get_sha1: avoid repeating ourselves via ONLY_TO_DIE | Jeff King | 2016-09-26 | 1 | -0/+6 |
* | | | | Merge branch 'dt/tree-fsck' | Junio C Hamano | 2016-10-03 | 2 | -4/+37 |
|\ \ \ \ | |||||
| * | | | | fsck: handle bad trees like other errorsdt/tree-fsck | David Turner | 2016-09-27 | 1 | -2/+14 |
| * | | | | tree-walk: be more specific about corrupt tree errors | Jeff King | 2016-09-27 | 1 | -2/+23 |
| |/ / / | |||||
* | | | | Merge branch 'kd/mailinfo-quoted-string' | Junio C Hamano | 2016-10-03 | 5 | -33/+77 |
|\ \ \ \ | |||||
| * | | | | mailinfo: unescape quoted-pair in header fieldskd/mailinfo-quoted-string | Kevin Daudt | 2016-09-28 | 5 | -0/+42 |
| * | | | | t5100-mailinfo: replace common path prefix with variable | Kevin Daudt | 2016-09-28 | 1 | -33/+35 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'js/t9903-chaining' into maint | Junio C Hamano | 2016-09-19 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ep/use-git-trace-curl-in-tests' into maint | Junio C Hamano | 2016-09-19 | 4 | -9/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'js/t6026-clean-up' into maint | Junio C Hamano | 2016-09-19 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint | Junio C Hamano | 2016-09-19 | 1 | -7/+14 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/submodule-anchor-git-dir' into maint | Junio C Hamano | 2016-09-19 | 1 | -0/+35 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/test-lib-drop-pid-from-results' into maint | Junio C Hamano | 2016-09-19 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch 'nd/init-core-worktree-in-multi-worktree-world' | Junio C Hamano | 2016-10-03 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | init: do not set unnecessary core.worktree | Nguyễn Thái Ngọc Duy | 2016-09-25 | 1 | -0/+2 |
| * | | | | | | | | | | init: correct re-initialization from a linked worktree | Nguyễn Thái Ngọc Duy | 2016-09-25 | 1 | -0/+15 |
* | | | | | | | | | | | Merge branch 'ik/gitweb-force-highlight' | Junio C Hamano | 2016-10-03 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | gitweb: use highlight's shebang detectionik/gitweb-force-highlight | Ian Kelling | 2016-09-25 | 1 | -0/+8 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jt/mailinfo-fold-in-body-headers' | Junio C Hamano | 2016-09-29 | 10 | -3/+75 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | mailinfo: handle in-body header continuations | Jonathan Tan | 2016-09-21 | 10 | -3/+75 |
* | | | | | | | | | | | | Merge branch 'rt/rebase-i-broken-insn-advise' | Junio C Hamano | 2016-09-26 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-advise | Ralf Thielow | 2016-09-07 | 1 | -3/+3 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' | Junio C Hamano | 2016-09-26 | 2 | -0/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | t3700-add: do not check working tree file mode without POSIXPERM | Johannes Sixt | 2016-09-21 | 1 | -4/+2 |
| * | | | | | | | | | | | | t3700-add: create subdirectory gently | Johannes Sixt | 2016-09-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 | 1 | -0/+50 |
| * | | | | | | | | | | | | update-index: add test for chmod flags | Thomas Gummerer | 2016-09-14 | 1 | -0/+13 |
* | | | | | | | | | | | | | Merge branch 'js/regexec-buf' | Junio C Hamano | 2016-09-26 | 1 | -0/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | regex: use regexec_buf() | Johannes Schindelin | 2016-09-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and fails | Johannes Schindelin | 2016-09-21 | 1 | -0/+22 |
* | | | | | | | | | | | | | | Merge branch 'nd/checkout-disambiguation' | Junio C Hamano | 2016-09-26 | 2 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguation | Nguyễn Thái Ngọc Duy | 2016-09-21 | 2 | -0/+21 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'va/i18n-more' | Junio C Hamano | 2016-09-26 | 4 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | i18n: notes-merge: mark die messages for translation | Vasco Almeida | 2016-09-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | i18n: connect: mark die messages for translation | Vasco Almeida | 2016-09-19 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | i18n: commit: mark message for translation | Vasco Almeida | 2016-09-19 | 2 | -5/+5 |
* | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-rfc' | Junio C Hamano | 2016-09-26 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | format-patch: add "--rfc" for the common case of [RFC PATCH]jt/format-patch-rfc | Josh Triplett | 2016-09-21 | 1 | -0/+9 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-09-26 | 1 | -0/+216 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |