Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-context | René Scharfe | 2016-09-14 | 2 | -1/+26 | |
* | | | | | | | | | | | | Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maint | Junio C Hamano | 2016-09-29 | 1 | -11/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | http: always remove curl easy from curlm session on releaseew/http-do-not-forget-to-call-curl-multi-remove-handle | Eric Wong | 2016-09-13 | 1 | -4/+6 | |
| * | | | | | | | | | | | | http: consolidate #ifdefs for curl_multi_remove_handle | Eric Wong | 2016-09-13 | 1 | -7/+10 | |
| * | | | | | | | | | | | | http: warn on curl_multi_add_handle failures | Eric Wong | 2016-09-13 | 1 | -0/+2 | |
* | | | | | | | | | | | | | Merge branch 'jk/patch-ids-no-merges' into maint | Junio C Hamano | 2016-09-29 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | patch-ids: refuse to compute patch-id for merge commitjk/patch-ids-no-merges | Jeff King | 2016-09-12 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | patch-ids: turn off rename detection | Jeff King | 2016-09-09 | 1 | -0/+1 | |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'js/git-gui-commit-gpgsign' into maint | Junio C Hamano | 2016-09-29 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignjs/git-gui-commit-gpgsign | Junio C Hamano | 2016-09-11 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | git-gui: respect commit.gpgsign again | Johannes Schindelin | 2016-09-11 | 1 | -0/+3 | |
* | | | | | | | | | | | | | | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint | Junio C Hamano | 2016-09-29 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | remote-curl: handle URLs without protocoljk/fix-remote-curl-url-wo-proto | Jeff King | 2016-09-08 | 2 | -1/+9 | |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'sy/git-gui-i18n-ja' into maint | Junio C Hamano | 2016-09-29 | 1 | -1309/+1438 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sy/i18n' of git-guisy/git-gui-i18n-ja | Junio C Hamano | 2016-09-07 | 1 | -1309/+1438 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | git-gui: update Japanese information | Satoshi Yasushima | 2016-09-07 | 1 | -2/+4 | |
| | * | | | | | | | | | | | | | git-gui: update Japanese translation | Satoshi Yasushima | 2016-09-07 | 1 | -42/+35 | |
| | * | | | | | | | | | | | | | git-gui: add Japanese language code | Satoshi Yasushima | 2016-09-07 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | git-gui: apply po template to Japanese translation | Satoshi Yasushima | 2016-09-07 | 1 | -1304/+1437 | |
| | * | | | | | | | | | | | | | git-gui: consistently use the same word for "blame" in Japanese | Satoshi Yasushima | 2016-09-07 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | git-gui: consistently use the same word for "remote" in Japanese | Satoshi Yasushima | 2016-09-07 | 1 | -3/+4 | |
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'mr/vcs-svn-printf-ulong' into maint | Junio C Hamano | 2016-09-29 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | vcs-svn/fast_export: fix timestamp fmt specifiersmr/vcs-svn-printf-ulong | Mike Ralphson | 2016-09-14 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint | Junio C Hamano | 2016-09-29 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | unpack-trees: pass checkout state explicitly to check_updates() | René Scharfe | 2016-09-13 | 1 | -4/+5 | |
* | | | | | | | | | | | | | | | | Merge branch 'rs/strbuf-remove-fix' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | strbuf: use valid pointer in strbuf_remove()rs/strbuf-remove-fix | René Scharfe | 2016-09-13 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'rs/checkout-some-states-are-const' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()rs/checkout-some-states-are-const | René Scharfe | 2016-09-13 | 1 | -3/+3 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'bw/pathspec-remove-unused-extern-decl' into maint | Junio C Hamano | 2016-09-29 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | pathspec: remove unnecessary function prototypesbw/pathspec-remove-unused-extern-decl | Brandon Williams | 2016-09-13 | 1 | -2/+0 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Start preparing for 2.10.1 | Junio C Hamano | 2016-09-19 | 2 | -1/+34 | |
* | | | | | | | | | | | | | | | | Merge branch 'sb/diff-cleanup' into maint | Junio C Hamano | 2016-09-19 | 1 | -21/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | diff: remove dead codesb/diff-cleanup | Stefan Beller | 2016-09-08 | 1 | -8/+0 | |
| * | | | | | | | | | | | | | | | | diff: omit found pointer from emit_callback | Stefan Beller | 2016-09-08 | 1 | -4/+2 | |
| * | | | | | | | | | | | | | | | | diff.c: use diff_options directly | Stefan Beller | 2016-09-08 | 1 | -11/+10 | |
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'ah/misc-message-fixes' into maint | Junio C Hamano | 2016-09-19 | 5 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | unpack-trees: do not capitalize "working"ah/misc-message-fixes | Alex Henrie | 2016-09-08 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | git-merge-octopus: do not capitalize "octopus" | Alex Henrie | 2016-09-08 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | git-rebase--interactive: fix English grammar | Alex Henrie | 2016-09-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | cat-file: put spaces around pipes in usage string | Alex Henrie | 2016-09-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | am: put spaces around pipe in usage string | Alex Henrie | 2016-09-08 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maint | Junio C Hamano | 2016-09-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | transport: report missing submodule pushes consistently on stderrsb/transport-report-missing-submodule-on-stderr | Stefan Beller | 2016-09-08 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'sb/xdiff-remove-unused-static-decl' into maint | Junio C Hamano | 2016-09-19 | 1 | -9/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | xdiff: remove unneeded declarationssb/xdiff-remove-unused-static-decl | Stefan Beller | 2016-09-07 | 1 | -9/+0 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'js/t9903-chaining' into maint | Junio C Hamano | 2016-09-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t9903: fix broken && chainjs/t9903-chaining | Johannes Sixt | 2016-09-07 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'rs/hex2chr' into maint | Junio C Hamano | 2016-09-19 | 6 | -78/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | introduce hex2chr() for converting two hexadecimal digits to a characterrs/hex2chr | René Scharfe | 2016-09-07 | 6 | -78/+21 | |
| |/ / / / / / / / / / / / / / / |