Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-p4: add P4 jobs to git commit messagejd/p4-jobs-in-commit | Jan Durovec | 2016-04-19 | 3 | -0/+120 |
* | git-p4: clean-up code style in tests | Jan Durovec | 2016-04-19 | 2 | -42/+42 |
* | Fifth batch for post 2.8 cycle | Junio C Hamano | 2016-04-18 | 1 | -0/+12 |
* | Merge branch 'jk/branch-shortening-funny-symrefs' | Junio C Hamano | 2016-04-18 | 2 | -7/+24 |
|\ | |||||
| * | branch: fix shortening of non-remote symrefsjk/branch-shortening-funny-symrefs | Jeff King | 2016-04-04 | 2 | -7/+24 |
* | | Merge branch 'ky/branch-m-worktree' | Junio C Hamano | 2016-04-18 | 6 | -3/+98 |
|\ \ | |||||
| * | | set_worktree_head_symref(): fix error messageky/branch-m-worktree | Kazuki Yamaguchi | 2016-04-08 | 1 | -1/+2 |
| * | | branch -m: update all per-worktree HEADs | Kazuki Yamaguchi | 2016-04-04 | 4 | -3/+53 |
| * | | refs: add a new function set_worktree_head_symref | Kazuki Yamaguchi | 2016-04-04 | 2 | -0/+44 |
* | | | Merge branch 'maint' | Junio C Hamano | 2016-04-14 | 1 | -0/+55 |
|\ \ \ | |||||
| * | | | Prepare for 2.8.2 | Junio C Hamano | 2016-04-14 | 1 | -0/+38 |
| * | | | Merge branch 'jv/merge-nothing-into-void' into maint | Junio C Hamano | 2016-04-14 | 2 | -5/+15 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ss/commit-squash-msg' into maint | Junio C Hamano | 2016-04-14 | 2 | -1/+38 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint | Junio C Hamano | 2016-04-14 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'da/mergetool-delete-delete-conflict' into maint | Junio C Hamano | 2016-04-14 | 2 | -4/+85 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | 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 |