aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-29
|\
| * format-patch: show base info before email signatureJosh Triplett2016-09-15
* | Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano2016-09-29
|\ \
| * | t/perf/run: copy config.mak.autogen & friends to build areaKirill Smelkov2016-09-15
* | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-29
|\ \ \
| * | | xdiff: fix merging of hunks with -W context and -u contextRené Scharfe2016-09-14
* | | | Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maintJunio C Hamano2016-09-29
|\ \ \ \
| * | | | http: always remove curl easy from curlm session on releaseEric Wong2016-09-13
| * | | | http: consolidate #ifdefs for curl_multi_remove_handleEric Wong2016-09-13
| * | | | http: warn on curl_multi_add_handle failuresEric Wong2016-09-13
* | | | | Merge branch 'jk/patch-ids-no-merges' into maintJunio C Hamano2016-09-29
|\ \ \ \ \
| * | | | | patch-ids: refuse to compute patch-id for merge commitJeff King2016-09-12
| * | | | | patch-ids: turn off rename detectionJeff King2016-09-09
| | |_|_|/ | |/| | |
* | | | | Merge branch 'js/git-gui-commit-gpgsign' into maintJunio C Hamano2016-09-29
|\ \ \ \ \
| * \ \ \ \ Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignJunio C Hamano2016-09-11
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | git-gui: respect commit.gpgsign againJohannes Schindelin2016-09-11
* | | | | | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \
| * | | | | | remote-curl: handle URLs without protocolJeff King2016-09-08
* | | | | | | Merge branch 'sy/git-gui-i18n-ja' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'sy/i18n' of git-guiJunio C Hamano2016-09-07
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | git-gui: update Japanese informationSatoshi Yasushima2016-09-07
| | * | | | | | git-gui: update Japanese translationSatoshi Yasushima2016-09-07
| | * | | | | | git-gui: add Japanese language codeSatoshi Yasushima2016-09-07
| | * | | | | | git-gui: apply po template to Japanese translationSatoshi Yasushima2016-09-07
| | * | | | | | git-gui: consistently use the same word for "blame" in JapaneseSatoshi Yasushima2016-09-07
| | * | | | | | git-gui: consistently use the same word for "remote" in JapaneseSatoshi Yasushima2016-09-07
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'mr/vcs-svn-printf-ulong' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \
| * | | | | | | vcs-svn/fast_export: fix timestamp fmt specifiersMike Ralphson2016-09-14
* | | | | | | | Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \
| * | | | | | | | unpack-trees: pass checkout state explicitly to check_updates()René Scharfe2016-09-13
* | | | | | | | | Merge branch 'rs/strbuf-remove-fix' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | strbuf: use valid pointer in strbuf_remove()René Scharfe2016-09-13
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: constify parameters of checkout_stage() and checkout_merged()René Scharfe2016-09-13
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bw/pathspec-remove-unused-extern-decl' into maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pathspec: remove unnecessary function prototypesBrandon Williams2016-09-13
| |/ / / / / / / /
* | | | | | | | | Start preparing for 2.10.1Junio C Hamano2016-09-19
* | | | | | | | | Merge branch 'sb/diff-cleanup' into maintJunio C Hamano2016-09-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: remove dead codeStefan Beller2016-09-08
| * | | | | | | | | diff: omit found pointer from emit_callbackStefan Beller2016-09-08
| * | | | | | | | | diff.c: use diff_options directlyStefan Beller2016-09-08
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ah/misc-message-fixes' into maintJunio C Hamano2016-09-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack-trees: do not capitalize "working"Alex Henrie2016-09-08
| * | | | | | | | | git-merge-octopus: do not capitalize "octopus"Alex Henrie2016-09-08
| * | | | | | | | | git-rebase--interactive: fix English grammarAlex Henrie2016-09-08
| * | | | | | | | | cat-file: put spaces around pipes in usage stringAlex Henrie2016-09-08
| * | | | | | | | | am: put spaces around pipe in usage stringAlex Henrie2016-09-08
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sb/transport-report-missing-submodule-on-stderr' into maintJunio C Hamano2016-09-19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | transport: report missing submodule pushes consistently on stderrStefan Beller2016-09-08
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sb/xdiff-remove-unused-static-decl' into maintJunio C Hamano2016-09-19
|\ \ \ \ \ \ \ \ \