Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rd/send-email-2047-fix' | Junio C Hamano | 2015-01-07 | 2 | -11/+32 |
|\ | |||||
| * | send-email: handle adjacent RFC 2047-encoded words properlyrd/send-email-2047-fix | Роман Донченко | 2014-12-15 | 2 | -10/+23 |
| * | send-email: align RFC 2047 decoding more closely with the spec | Роман Донченко | 2014-12-15 | 1 | -11/+19 |
* | | Merge branch 'pd/completion-filenames-fix' | Junio C Hamano | 2015-01-07 | 2 | -3/+3 |
|\ \ | |||||
| * | | Update documentation occurrences of filename .shpd/completion-filenames-fix | Peter van der Does | 2014-12-15 | 2 | -3/+3 |
* | | | Merge branch 'jk/add-i-read-error' | Junio C Hamano | 2015-01-07 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | add--interactive: leave main loop on read errorjk/add-i-read-error | Jeff King | 2014-12-15 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' | Junio C Hamano | 2015-01-07 | 2 | -9/+15 |
|\ \ \ | |||||
| * | | | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-dates | Jeff King | 2014-11-13 | 2 | -2/+5 |
| * | | | pass TIME_DATE_NOW to approxidate future-check | Jeff King | 2014-11-13 | 1 | -7/+10 |
* | | | | Merge branch 'br/imap-send-via-libcurl' | Junio C Hamano | 2015-01-07 | 4 | -37/+191 |
|\ \ \ \ | |||||
| * | | | | git-imap-send: use libcurl for implementationbr/imap-send-via-libcurl | Bernhard Reiter | 2014-11-10 | 4 | -37/+191 |
* | | | | | Merge branch 'br/imap-send-verbosity' | Junio C Hamano | 2015-01-07 | 2 | -11/+31 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | imap-send: use parse options API to determine verbositybr/imap-send-verbosity | Bernhard Reiter | 2014-11-05 | 2 | -11/+31 |
* | | | | | Merge branch 'nd/lockfile-absolute' | Junio C Hamano | 2015-01-07 | 2 | -3/+26 |
|\ \ \ \ \ | |||||
| * | | | | | lockfile.c: store absolute pathnd/lockfile-absolute | Nguyễn Thái Ngọc Duy | 2014-11-03 | 2 | -3/+26 |
* | | | | | | Merge branch 'jc/merge-bases' | Junio C Hamano | 2015-01-07 | 11 | -22/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | get_merge_bases(): always clean-up object flagsjc/merge-bases | Junio C Hamano | 2014-10-30 | 11 | -22/+38 |
| * | | | | | | bisect: clean flags after checking merge bases | Junio C Hamano | 2014-10-30 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence' | Junio C Hamano | 2015-01-07 | 2 | -1/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | strbuf_add_commented_lines(): avoid SP-HT sequence in commented linesjc/strbuf-add-lines-avoid-sp-ht-sequence | Junio C Hamano | 2014-10-27 | 2 | -1/+8 |
* | | | | | | | Merge branch 'jc/diff-b-m' | Junio C Hamano | 2015-01-07 | 3 | -3/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff -B -M: fix output for "copy and then rewrite" case | Junio C Hamano | 2014-10-23 | 3 | -3/+11 |
* | | | | | | | | Merge branch 'jc/clone-borrow' | Junio C Hamano | 2015-01-07 | 3 | -2/+46 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: --dissociate option to mark that reference is only temporaryjc/clone-borrow | Junio C Hamano | 2014-10-15 | 3 | -2/+46 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/checkout-local-track-report' | Junio C Hamano | 2015-01-07 | 2 | -11/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout: report upstream correctly even with loosely defined branch.*.mergejc/checkout-local-track-report | Junio C Hamano | 2014-10-14 | 2 | -11/+41 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'for-junio' of git://bogomips.org/git-svn | Junio C Hamano | 2014-12-29 | 3 | -1/+181 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-svn: support for git-svn propset | Alfred Perlstein | 2014-12-09 | 3 | -1/+181 |
* | | | | | | | | | Merge branch 'jc/t9001-modernise' | Junio C Hamano | 2014-12-29 | 1 | -294/+287 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t9001: style modernisation phase #5jc/t9001-modernise | Junio C Hamano | 2014-11-25 | 1 | -76/+74 |
| * | | | | | | | | | t9001: style modernisation phase #4 | Junio C Hamano | 2014-11-25 | 1 | -10/+10 |
| * | | | | | | | | | t9001: style modernisation phase #3 | Junio C Hamano | 2014-11-25 | 1 | -52/+47 |
| * | | | | | | | | | t9001: style modernisation phase #2 | Junio C Hamano | 2014-11-25 | 1 | -151/+151 |
| * | | | | | | | | | t9001: style modernisation phase #1 | Junio C Hamano | 2014-11-25 | 1 | -17/+17 |
* | | | | | | | | | | Merge branch 'mh/update-ref-verify' | Junio C Hamano | 2014-12-29 | 2 | -9/+97 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | update-ref: fix "verify" command with missing <oldvalue>mh/update-ref-verify | Michael Haggerty | 2014-12-11 | 2 | -11/+7 |
| * | | | | | | | | | | t1400: add some more tests of "update-ref --stdin"'s verify command | Michael Haggerty | 2014-12-11 | 1 | -0/+92 |
* | | | | | | | | | | | Sync with maint | Junio C Hamano | 2014-12-22 | 2 | -1/+34 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Prepare for 2.2.2 | Junio C Hamano | 2014-12-22 | 2 | -1/+34 |
| * | | | | | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maint | Junio C Hamano | 2014-12-22 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/no-perl-tests' into maint | Junio C Hamano | 2014-12-22 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'po/everyday-doc' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/push-simple' into maint | Junio C Hamano | 2014-12-22 | 2 | -6/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mh/config-flip-xbit-back-after-checking' into maint | Junio C Hamano | 2014-12-22 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/receive-pack-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/maint-config-use-labs' into maint | Junio C Hamano | 2014-12-22 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/windows-open-eisdir-error' into maint | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/colors-fix' into maint | Junio C Hamano | 2014-12-22 | 3 | -14/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |