aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | Merge branch 'jk/startup-info' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/getwholeline-getdelim-empty' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/credential-cache-comment-exit' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mp/upload-pack-use-embedded-args' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'oa/doc-diff-check' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/opt-cmdmode-doc' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/apply-doc' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/doc-recommend-performance-trace-to-file' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/lockfile-error-message' into maintJunio C Hamano2016-04-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start preparing for 2.8.2Junio C Hamano2016-04-13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for post 2.8 cycleJunio C Hamano2016-04-13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct blame for files commited with CRLFTorsten Bögershausen2016-04-05
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/complete-cherry-mark-to-log'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: complete --cherry-mark for git logMichael J Gruber2016-04-05
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api-trace.txt: fix typoElia Pinto2016-04-05
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/makefile-redirection-stderr'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: fix misdirected redirectionsJunio C Hamano2016-04-05
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: test --expand-tabsJunio C Hamano2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: allow tweaking tabwidth in --expand-tabsJunio C Hamano2016-03-30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formatsJunio C Hamano2016-03-30
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: expand tabs in indented logs to make things line up properlyLinus Torvalds2016-03-30
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --[no-]autostash with pull.rebase=trueMehul Jain2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: reduce commom lines of codeMehul Jain2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "failing autostash" codeMehul Jain2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "successful autostash" codeMehul Jain2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use better test to check stderr outputMehul Jain2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: ensure consistent test conditionsMehul Jain2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use consistent capitalization in test titlesMehul Jain2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-pull.c: introduce git_pull_config()Mehul Jain2016-03-21
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/mergetools-examdiff'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: add support for ExamDiffJacob Nisnevich2016-04-04
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: create mergetool_find_win32_cmd() helper function for winmergeJacob Nisnevich2016-04-04
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/format-patch-doc-hide-no-patch'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-format-patch.txt: don't show -s as shorthand for multiple optionsEric Sunshine2016-04-04
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8'Junio C Hamano2016-04-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: shorten code by re-using convert_slashes()Johannes Sixt2016-04-04