Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'sb/t5400-remove-unused' | Junio C Hamano | 2015-01-07 |
|\ | |||
| * | t5400: remove dead code | Stefan Beller | 2014-12-16 |
* | | Merge branch 'lh/send-email-hide-x-mailer' | Junio C Hamano | 2015-01-07 |
|\ \ | |||
| * | | test/send-email: --[no-]xmailer tests | Luis Henriques | 2014-12-15 |
* | | | Merge branch 'rd/send-email-2047-fix' | Junio C Hamano | 2015-01-07 |
|\ \ \ | |||
| * | | | send-email: handle adjacent RFC 2047-encoded words properly | Роман Донченко | 2014-12-15 |
* | | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' | Junio C Hamano | 2015-01-07 |
|\ \ \ \ | |||
| * | | | | approxidate: allow ISO-like dates far in the future | Jeff King | 2014-11-13 |
* | | | | | Merge branch 'nd/lockfile-absolute' | Junio C Hamano | 2015-01-07 |
|\ \ \ \ \ | |||
| * | | | | | lockfile.c: store absolute path | Nguyễn Thái Ngọc Duy | 2014-11-03 |
* | | | | | | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence' | Junio C Hamano | 2015-01-07 |
|\ \ \ \ \ \ | |||
| * | | | | | | strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines | Junio C Hamano | 2014-10-27 |
* | | | | | | | Merge branch 'jc/diff-b-m' | Junio C Hamano | 2015-01-07 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | diff -B -M: fix output for "copy and then rewrite" case | Junio C Hamano | 2014-10-23 |
* | | | | | | | | Merge branch 'jc/clone-borrow' | Junio C Hamano | 2015-01-07 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | clone: --dissociate option to mark that reference is only temporary | Junio C Hamano | 2014-10-15 |
| | |/ / / / / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'jc/checkout-local-track-report' | Junio C Hamano | 2015-01-07 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | checkout: report upstream correctly even with loosely defined branch.*.merge | Junio C Hamano | 2014-10-14 |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'for-junio' of git://bogomips.org/git-svn | Junio C Hamano | 2014-12-29 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | git-svn: support for git-svn propset | Alfred Perlstein | 2014-12-09 |
* | | | | | | | | | Merge branch 'jc/t9001-modernise' | Junio C Hamano | 2014-12-29 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t9001: style modernisation phase #5 | Junio C Hamano | 2014-11-25 |
| * | | | | | | | | | t9001: style modernisation phase #4 | Junio C Hamano | 2014-11-25 |
| * | | | | | | | | | t9001: style modernisation phase #3 | Junio C Hamano | 2014-11-25 |
| * | | | | | | | | | t9001: style modernisation phase #2 | Junio C Hamano | 2014-11-25 |
| * | | | | | | | | | t9001: style modernisation phase #1 | Junio C Hamano | 2014-11-25 |
* | | | | | | | | | | Merge branch 'mh/update-ref-verify' | Junio C Hamano | 2014-12-29 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | update-ref: fix "verify" command with missing <oldvalue> | Michael Haggerty | 2014-12-11 |
| * | | | | | | | | | | t1400: add some more tests of "update-ref --stdin"'s verify command | Michael Haggerty | 2014-12-11 |
* | | | | | | | | | | | Merge branch 'ch/new-gpg-drops-rfc-1991' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | tests: make comment on GPG keyring match the code | Christian Hesse | 2014-12-16 |
| * | | | | | | | | | | | tests: squelch noise from GPG machinery set-up | Junio C Hamano | 2014-12-12 |
| * | | | | | | | | | | | tests: replace binary GPG keyrings with ASCII-armored keys | Christian Hesse | 2014-12-12 |
| * | | | | | | | | | | | tests: skip RFC1991 tests for gnupg 2.1 | Christian Hesse | 2014-12-12 |
| * | | | | | | | | | | | tests: create gpg homedir on the fly | Christian Hesse | 2014-12-12 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'jk/test-asan' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | t: support clang/gcc AddressSanitizer | Jeff King | 2014-12-11 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'jk/always-allow-large-packets' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | pkt-line: allow writing of LARGE_PACKET_MAX buffers | Jeff King | 2014-12-10 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | Merge branch 'jk/colors' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | parse_color: recognize "no$foo" to clear the $foo attribute | Jeff King | 2014-11-20 |
| * | | | | | | | | | | | parse_color: support 24-bit RGB values | Jeff King | 2014-11-20 |
* | | | | | | | | | | | | Merge branch 'js/fsck-tag-validation' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | fsck: properly bound "invalid tag name" error message | Jeff King | 2014-12-09 |
* | | | | | | | | | | | | | Merge branch 'mg/branch-d-m-f' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | branch: allow -f with -m and -d | Michael J Gruber | 2014-12-09 |
| * | | | | | | | | | | | | | t3200-branch: test -M | Michael J Gruber | 2014-12-04 |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'tb/t0027-eol-conversion' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | t0027: check the eol conversion warnings | Torsten Bögershausen | 2014-12-05 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'jk/for-each-reflog-ent-reverse' | Junio C Hamano | 2014-12-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |