summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* imap-send.c: introduce the GIT_TRACE_CURL enviroment variableep/http-curl-traceElia Pinto2016-05-241-0/+1
* http.c: implement the GIT_TRACE_CURL environment variableElia Pinto2016-05-243-2/+132
* Fifth batch for post 2.8 cycleJunio C Hamano2016-04-181-0/+12
* Merge branch 'jk/branch-shortening-funny-symrefs'Junio C Hamano2016-04-182-7/+24
|\
| * branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefsJeff King2016-04-042-7/+24
* | Merge branch 'ky/branch-m-worktree'Junio C Hamano2016-04-186-3/+98
|\ \
| * | set_worktree_head_symref(): fix error messageky/branch-m-worktreeKazuki Yamaguchi2016-04-081-1/+2
| * | branch -m: update all per-worktree HEADsKazuki Yamaguchi2016-04-044-3/+53
| * | refs: add a new function set_worktree_head_symrefKazuki Yamaguchi2016-04-042-0/+44
* | | Merge branch 'maint'Junio C Hamano2016-04-141-0/+55
|\ \ \
| * | | Prepare for 2.8.2Junio C Hamano2016-04-141-0/+38
| * | | Merge branch 'jv/merge-nothing-into-void' into maintJunio C Hamano2016-04-142-5/+15
| |\ \ \
| * \ \ \ Merge branch 'ss/commit-squash-msg' into maintJunio C Hamano2016-04-142-1/+38
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/send-email-rtrim-mailrc-alias' into maintJunio C Hamano2016-04-141-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'da/mergetool-delete-delete-conflict' into maintJunio C Hamano2016-04-142-4/+85
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-1413-26/+54
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-142-1/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintJunio C Hamano2016-04-141-1/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-143-3/+31
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-142-18/+77
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-143-11/+16
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano2016-04-141-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano2016-04-141-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano2016-04-1410-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/credential-cache-comment-exit' into maintJunio C Hamano2016-04-141-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-142-18/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maintJunio C Hamano2016-04-143-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mp/upload-pack-use-embedded-args' into maintJunio C Hamano2016-04-141-14/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'oa/doc-diff-check' into maintJunio C Hamano2016-04-141-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/opt-cmdmode-doc' into maintJunio C Hamano2016-04-141-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/apply-doc' into maintJunio C Hamano2016-04-141-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/doc-recommend-performance-trace-to-file' into maintJunio C Hamano2016-04-141-0/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/lockfile-error-message' into maintJunio C Hamano2016-04-141-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Start preparing for 2.8.2Junio C Hamano2016-04-131-0/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for post 2.8 cycleJunio C Hamano2016-04-131-2/+65
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-132-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlfTorsten Bögershausen2016-04-052-0/+15
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/complete-cherry-mark-to-log'Junio C Hamano2016-04-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | completion: complete --cherry-mark for git logmg/complete-cherry-mark-to-logMichael J Gruber2016-04-051-0/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix'Junio C Hamano2016-04-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | api-trace.txt: fix typoep/trace-doc-sample-fixElia Pinto2016-04-051-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/makefile-redirection-stderr'Junio C Hamano2016-04-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: fix misdirected redirectionsjc/makefile-redirection-stderrJunio C Hamano2016-04-051-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-139-10/+220
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: test --expand-tabslt/pretty-expand-tabsJunio C Hamano2016-04-041-0/+105
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: allow tweaking tabwidth in --expand-tabsJunio C Hamano2016-03-304-13/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-306-9/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: expand tabs in indented logs to make things line up properlyLinus Torvalds2016-03-306-2/+79
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-133-10/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --[no-]autostash with pull.rebase=truemj/pull-rebase-autostashMehul Jain2016-04-041-0/+10