Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/test-asan' | Junio C Hamano | 2014-12-22 | 2 | -0/+4 |
|\ | |||||
| * | t: support clang/gcc AddressSanitizerjk/test-asan | Jeff King | 2014-12-11 | 2 | -0/+4 |
* | | Merge branch 'jk/always-allow-large-packets' | Junio C Hamano | 2014-12-22 | 1 | -0/+33 |
|\ \ | |||||
| * | | pkt-line: allow writing of LARGE_PACKET_MAX buffersjk/always-allow-large-packets | Jeff King | 2014-12-10 | 1 | -0/+33 |
| |/ | |||||
* | | Merge branch 'jk/colors' | Junio C Hamano | 2014-12-22 | 1 | -0/+15 |
|\ \ | |||||
| * | | parse_color: recognize "no$foo" to clear the $foo attribute | Jeff King | 2014-11-20 | 1 | -0/+11 |
| * | | parse_color: support 24-bit RGB values | Jeff King | 2014-11-20 | 1 | -0/+4 |
* | | | Merge branch 'js/fsck-tag-validation' | Junio C Hamano | 2014-12-22 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | fsck: properly bound "invalid tag name" error message | Jeff King | 2014-12-09 | 1 | -2/+6 |
* | | | | Merge branch 'mg/branch-d-m-f' | Junio C Hamano | 2014-12-22 | 1 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | branch: allow -f with -m and -dmg/branch-d-m-f | Michael J Gruber | 2014-12-09 | 1 | -0/+5 |
| * | | | | t3200-branch: test -M | Michael J Gruber | 2014-12-04 | 1 | -0/+9 |
* | | | | | Merge branch 'tb/t0027-eol-conversion' | Junio C Hamano | 2014-12-22 | 1 | -16/+66 |
|\ \ \ \ \ | |||||
| * | | | | | t0027: check the eol conversion warningstb/t0027-eol-conversion | Torsten Bögershausen | 2014-12-05 | 1 | -16/+66 |
* | | | | | | Merge branch 'jk/for-each-reflog-ent-reverse' | Junio C Hamano | 2014-12-22 | 1 | -0/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | for_each_reflog_ent_reverse: fix newlines on block boundaries | Jeff King | 2014-12-05 | 1 | -0/+30 |
* | | | | | | | Merge branch 'jk/credential-quit' | Junio C Hamano | 2014-12-22 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | credential: let helpers tell us to quit | Jeff King | 2014-12-04 | 1 | -0/+9 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'nd/ls-tree-pathspec' | Junio C Hamano | 2014-12-22 | 1 | -4/+18 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t3102: style modernizationnd/ls-tree-pathspec | Junio C Hamano | 2014-12-01 | 1 | -8/+8 |
| * | | | | | | | t3102: document that ls-tree does not yet support negated pathspec | Junio C Hamano | 2014-12-01 | 1 | -0/+6 |
| * | | | | | | | ls-tree: remove path filtering logic in show_tree | Nguyễn Thái Ngọc Duy | 2014-12-01 | 1 | -0/+8 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rj/t0050-passes' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t0050-*.sh: mark the rename (case change) test as passingrj/t0050-passes | Ramsay Jones | 2014-11-30 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'js/push-to-deploy' | Junio C Hamano | 2014-12-22 | 1 | -0/+104 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5516: more tests for receive.denyCurrentBranch=updateInsteadjs/push-to-updatejs/push-to-deploy | Junio C Hamano | 2014-11-30 | 1 | -9/+87 |
| * | | | | | | | | receive-pack: add another option for receive.denyCurrentBranch | Johannes Schindelin | 2014-11-30 | 1 | -0/+26 |
* | | | | | | | | | Merge branch 'pb/send-email-te' | Junio C Hamano | 2014-12-22 | 1 | -0/+157 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-send-email: add --transfer-encoding optionpb/send-email-te | Paolo Bonzini | 2014-11-25 | 1 | -0/+157 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'pb/am-message-id-footer' | Junio C Hamano | 2014-12-22 | 5 | -0/+70 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-am: add --message-id/--no-message-idpb/am-message-id-footer | Paolo Bonzini | 2014-11-25 | 1 | -0/+23 |
| * | | | | | | | | | git-mailinfo: add --message-id | Paolo Bonzini | 2014-11-25 | 4 | -0/+47 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'js/t5000-dont-copy-bin-sh' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5000 on Windows: do not mistake "sh.exe" as "sh"js/t5000-dont-copy-bin-sh | Johannes Sixt | 2014-11-24 | 1 | -1/+1 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/refer-to-t-readme-from-submitting-patches' | Junio C Hamano | 2014-12-22 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t/README: justify why "! grep foo" is sufficientjc/refer-to-t-readme-from-submitting-patches | Junio C Hamano | 2014-11-24 | 1 | -1/+2 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'mg/add-ignore-errors' | Junio C Hamano | 2014-12-22 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add: ignore only ignored filesmg/add-ignore-errors | Michael J Gruber | 2014-11-21 | 1 | -1/+7 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cc/interpret-trailers-more' | Junio C Hamano | 2014-12-22 | 2 | -9/+67 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | trailer: add test with an old style conflict blockcc/interpret-trailers-more | Christian Couder | 2014-11-10 | 1 | -1/+31 |
| * | | | | | | | | | trailer: reuse ignore_non_trailer() to ignore conflict lines | Christian Couder | 2014-11-10 | 1 | -0/+2 |
| * | | | | | | | | | Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more | Junio C Hamano | 2014-11-10 | 1 | -8/+34 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | merge & sequencer: turn "Conflicts:" hint into a commentjc/conflict-hint | Junio C Hamano | 2014-10-28 | 1 | -8/+34 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Sync with v2.2.1 | Junio C Hamano | 2014-12-18 | 3 | -31/+102 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Sync with v2.1.4 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Sync with v2.0.5 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Sync with v1.9.5 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Sync with v1.8.5.6 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5 | Junio C Hamano | 2014-12-17 | 3 | -31/+102 |
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / | | | | | |/| | | | | | | | |||||
| | | | | | * | | | | | | | fsck: complain about NTFS ".git" aliases in trees | Johannes Schindelin | 2014-12-17 | 1 | -2/+7 |