Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | Merge branch 'jk/startup-info' into maint | Junio C Hamano | 2016-04-14 | 13 | -26/+54 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/getwholeline-getdelim-empty' into maint | Junio C Hamano | 2016-04-14 | 2 | -1/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'gf/fetch-pack-direct-object-fetch' into maint | Junio C Hamano | 2016-04-14 | 3 | -3/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rev-parse-local-env-vars' into maint | Junio C Hamano | 2016-04-14 | 2 | -18/+77 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/config-get-urlmatch' into maint | Junio C Hamano | 2016-04-14 | 3 | -11/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/t7502-drop-dup' into maint | Junio C Hamano | 2016-04-14 | 1 | -5/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-httpd-config-nosystem' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/clone-t57-t56' into maint | Junio C Hamano | 2016-04-14 | 10 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/credential-cache-comment-exit' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/index-pack' into maint | Junio C Hamano | 2016-04-14 | 2 | -18/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maint | Junio C Hamano | 2016-04-14 | 3 | -9/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mp/upload-pack-use-embedded-args' into maint | Junio C Hamano | 2016-04-14 | 1 | -14/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'oa/doc-diff-check' into maint | Junio C Hamano | 2016-04-14 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/opt-cmdmode-doc' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/apply-doc' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'cc/doc-recommend-performance-trace-to-file' into maint | Junio C Hamano | 2016-04-14 | 1 | -0/+43 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/lockfile-error-message' into maint | Junio C Hamano | 2016-04-14 | 1 | -5/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start preparing for 2.8.2 | Junio C Hamano | 2016-04-13 | 1 | -0/+17 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fourth batch for post 2.8 cycle | Junio C Hamano | 2016-04-13 | 1 | -2/+65 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' | Junio C Hamano | 2016-04-13 | 2 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct blame for files commited with CRLFtb/blame-force-read-cache-to-workaround-safe-crlf | Torsten Bögershausen | 2016-04-05 | 2 | -0/+15 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/complete-cherry-mark-to-log' | Junio C Hamano | 2016-04-13 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completion: complete --cherry-mark for git logmg/complete-cherry-mark-to-log | Michael J Gruber | 2016-04-05 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ep/trace-doc-sample-fix' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api-trace.txt: fix typoep/trace-doc-sample-fix | Elia Pinto | 2016-04-05 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/makefile-redirection-stderr' | Junio C Hamano | 2016-04-13 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile: fix misdirected redirectionsjc/makefile-redirection-stderr | Junio C Hamano | 2016-04-05 | 1 | -2/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/pretty-expand-tabs' | Junio C Hamano | 2016-04-13 | 9 | -10/+220 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: test --expand-tabslt/pretty-expand-tabs | Junio C Hamano | 2016-04-04 | 1 | -0/+105 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: allow tweaking tabwidth in --expand-tabs | Junio C Hamano | 2016-03-30 | 4 | -13/+22 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: enable --expand-tabs by default for selected pretty formats | Junio C Hamano | 2016-03-30 | 6 | -9/+28 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pretty: expand tabs in indented logs to make things line up properly | Linus Torvalds | 2016-03-30 | 6 | -2/+79 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mj/pull-rebase-autostash' | Junio C Hamano | 2016-04-13 | 3 | -10/+103 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: test --[no-]autostash with pull.rebase=truemj/pull-rebase-autostash | Mehul Jain | 2016-04-04 | 1 | -0/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: reduce commom lines of code | Mehul Jain | 2016-04-04 | 1 | -9/+7 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "failing autostash" code | Mehul Jain | 2016-04-04 | 1 | -15/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: factor out common "successful autostash" code | Mehul Jain | 2016-04-04 | 1 | -29/+15 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use better test to check stderr output | Mehul Jain | 2016-04-04 | 1 | -6/+4 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: ensure consistent test conditions | Mehul Jain | 2016-04-04 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5520: use consistent capitalization in test titles | Mehul Jain | 2016-04-04 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pull --rebase: add --[no-]autostash flag | Mehul Jain | 2016-03-21 | 3 | -0/+91 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-pull.c: introduce git_pull_config() | Mehul Jain | 2016-03-21 | 1 | -3/+15 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jn/mergetools-examdiff' | Junio C Hamano | 2016-04-13 | 3 | -20/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: add support for ExamDiffjn/mergetools-examdiff | Jacob Nisnevich | 2016-04-04 | 1 | -0/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergetools: create mergetool_find_win32_cmd() helper function for winmerge | Jacob Nisnevich | 2016-04-04 | 2 | -20/+26 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/format-patch-doc-hide-no-patch' | Junio C Hamano | 2016-04-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-format-patch.txt: don't show -s as shorthand for multiple optionses/format-patch-doc-hide-no-patch | Eric Sunshine | 2016-04-04 | 1 | -1/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/mingw-tests-2.8' | Junio C Hamano | 2016-04-13 | 2 | -11/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows: shorten code by re-using convert_slashes()js/mingw-tests-2.8 | Johannes Sixt | 2016-04-04 | 2 | -11/+3 |