summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-contextRené Scharfe2016-09-142-1/+26
* | | | | | | | | | | | Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maintJunio C Hamano2016-09-291-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http: always remove curl easy from curlm session on releaseew/http-do-not-forget-to-call-curl-multi-remove-handleEric Wong2016-09-131-4/+6
| * | | | | | | | | | | | http: consolidate #ifdefs for curl_multi_remove_handleEric Wong2016-09-131-7/+10
| * | | | | | | | | | | | http: warn on curl_multi_add_handle failuresEric Wong2016-09-131-0/+2
* | | | | | | | | | | | | Merge branch 'jk/patch-ids-no-merges' into maintJunio C Hamano2016-09-291-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | patch-ids: refuse to compute patch-id for merge commitjk/patch-ids-no-mergesJeff King2016-09-121-0/+15
| * | | | | | | | | | | | | patch-ids: turn off rename detectionJeff King2016-09-091-0/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'js/git-gui-commit-gpgsign' into maintJunio C Hamano2016-09-291-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignjs/git-gui-commit-gpgsignJunio C Hamano2016-09-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | git-gui: respect commit.gpgsign againJohannes Schindelin2016-09-111-0/+3
* | | | | | | | | | | | | | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2016-09-292-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote-curl: handle URLs without protocoljk/fix-remote-curl-url-wo-protoJeff King2016-09-082-1/+9
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'sy/git-gui-i18n-ja' into maintJunio C Hamano2016-09-291-1309/+1438
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sy/i18n' of git-guisy/git-gui-i18n-jaJunio C Hamano2016-09-071-1309/+1438
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | git-gui: update Japanese informationSatoshi Yasushima2016-09-071-2/+4
| | * | | | | | | | | | | | | git-gui: update Japanese translationSatoshi Yasushima2016-09-071-42/+35
| | * | | | | | | | | | | | | git-gui: add Japanese language codeSatoshi Yasushima2016-09-071-1/+1
| | * | | | | | | | | | | | | git-gui: apply po template to Japanese translationSatoshi Yasushima2016-09-071-1304/+1437
| | * | | | | | | | | | | | | git-gui: consistently use the same word for "blame" in JapaneseSatoshi Yasushima2016-09-071-2/+2
| | * | | | | | | | | | | | | git-gui: consistently use the same word for "remote" in JapaneseSatoshi Yasushima2016-09-071-3/+4
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mr/vcs-svn-printf-ulong' into maintJunio C Hamano2016-09-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | vcs-svn/fast_export: fix timestamp fmt specifiersmr/vcs-svn-printf-ulongMike Ralphson2016-09-141-2/+2
* | | | | | | | | | | | | | | Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maintJunio C Hamano2016-09-291-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | unpack-trees: pass checkout state explicitly to check_updates()René Scharfe2016-09-131-4/+5
* | | | | | | | | | | | | | | | Merge branch 'rs/strbuf-remove-fix' into maintJunio C Hamano2016-09-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | strbuf: use valid pointer in strbuf_remove()rs/strbuf-remove-fixRené Scharfe2016-09-131-1/+1
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-291-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()rs/checkout-some-states-are-constRené Scharfe2016-09-131-3/+3
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'bw/pathspec-remove-unused-extern-decl' into maintJunio C Hamano2016-09-291-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pathspec: remove unnecessary function prototypesbw/pathspec-remove-unused-extern-declBrandon Williams2016-09-131-2/+0
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Start preparing for 2.10.1Junio C Hamano2016-09-192-1/+34
* | | | | | | | | | | | | | | | Merge branch 'sb/diff-cleanup' into maintJunio C Hamano2016-09-191-21/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: remove dead codesb/diff-cleanupStefan Beller2016-09-081-8/+0
| * | | | | | | | | | | | | | | | diff: omit found pointer from emit_callbackStefan Beller2016-09-081-4/+2
| * | | | | | | | | | | | | | | | diff.c: use diff_options directlyStefan Beller2016-09-081-11/+10
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-195-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | unpack-trees: do not capitalize "working"ah/misc-message-fixesAlex Henrie2016-09-081-2/+2
| * | | | | | | | | | | | | | | | git-merge-octopus: do not capitalize "octopus"Alex Henrie2016-09-081-2/+2
| * | | | | | | | | | | | | | | | git-rebase--interactive: fix English grammarAlex Henrie2016-09-081-1/+1
| * | | | | | | | | | | | | | | | cat-file: put spaces around pipes in usage stringAlex Henrie2016-09-081-1/+1
| * | | | | | | | | | | | | | | | am: put spaces around pipe in usage stringAlex Henrie2016-09-081-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maintJunio C Hamano2016-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | transport: report missing submodule pushes consistently on stderrsb/transport-report-missing-submodule-on-stderrStefan Beller2016-09-081-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'sb/xdiff-remove-unused-static-decl' into maintJunio C Hamano2016-09-191-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | xdiff: remove unneeded declarationssb/xdiff-remove-unused-static-declStefan Beller2016-09-071-9/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'js/t9903-chaining' into maintJunio C Hamano2016-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t9903: fix broken && chainjs/t9903-chainingJohannes Sixt2016-09-071-1/+1
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'rs/hex2chr' into maintJunio C Hamano2016-09-196-78/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | introduce hex2chr() for converting two hexadecimal digits to a characterrs/hex2chrRené Scharfe2016-09-076-78/+21
| |/ / / / / / / / / / / / / / /