Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fourth batch for 2.3 cycle | Junio C Hamano | 2015-01-07 | 1 | -0/+82 |
* | Merge branch 'maint' | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
|\ | |||||
| * | Merge branch 'maint-2.1' into maint | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| |\ | |||||
| | * | Merge branch 'maint-2.0' into maint-2.1maint-2.1 | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| | |\ | |||||
| | | * | Merge branch 'maint-1.9' into maint-2.0maint-2.0 | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| | | |\ | |||||
| | | | * | Merge branch 'maint-1.8.5' into maint-1.9maint-1.9 | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| | | | |\ | |||||
| | | | | * | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5 | Junio C Hamano | 2015-01-07 | 2 | -12/+35 |
| | | | | |\ | |||||
| | | | | | * | is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5 | Jeff King | 2014-12-29 | 2 | -12/+35 |
* | | | | | | | Merge branch 'bw/maint-0090-awk-tweak' | Junio C Hamano | 2015-01-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t0090: tweak awk statement for Solaris /usr/xpg4/bin/awkbw/maint-0090-awk-tweak | Ben Walton | 2014-12-23 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jh/pre-push-sample-no-custom-ifs' | Junio C Hamano | 2015-01-07 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pre-push.sample: remove unnecessary and misleading IFS=' 'jh/pre-push-sample-no-custom-ifs | Jim Hill | 2014-12-22 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'tf/prompt-preserve-exit-status' | Junio C Hamano | 2015-01-07 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | git-prompt: preserve value of $? inside shell prompt | Tony Finch | 2014-12-22 | 1 | -0/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'sb/dco-indentation-fix' | Junio C Hamano | 2015-01-07 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation/SubmittingPatches: unify whitespace/tabs for the DCOsb/dco-indentation-fix | Stefan Beller | 2014-12-22 | 1 | -6/+6 |
* | | | | | | | | | Merge branch 'bb/update-unicode-table' | Junio C Hamano | 2015-01-07 | 1 | -7/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update_unicode.sh: delete the command groupbb/update-unicode-table | Beat Bolli | 2014-12-22 | 1 | -12/+11 |
| * | | | | | | | | | update_unicode.sh: make the output structure visible | Beat Bolli | 2014-12-22 | 1 | -7/+9 |
| * | | | | | | | | | update_unicode.sh: shorten uniset invocation path | Beat Bolli | 2014-12-22 | 1 | -2/+2 |
| * | | | | | | | | | update_unicode.sh: set UNICODE_DIR only once | Beat Bolli | 2014-12-22 | 1 | -2/+3 |
| * | | | | | | | | | update_unicode.sh: simplify output capture | Beat Bolli | 2014-12-22 | 1 | -8/+9 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'es/squelch-openssl-warnings-on-macosx' | Junio C Hamano | 2015-01-07 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | git-compat-util: suppress unavoidable Apple-specific deprecation warnings | Eric Sunshine | 2014-12-18 | 1 | -0/+4 |
* | | | | | | | | | | Merge branch 'sb/t5400-remove-unused' | Junio C Hamano | 2015-01-07 | 1 | -15/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t5400: remove dead codesb/t5400-remove-unused | Stefan Beller | 2014-12-16 | 1 | -15/+1 |
* | | | | | | | | | | | Merge branch 'lh/send-email-hide-x-mailer' | Junio C Hamano | 2015-01-07 | 4 | -3/+47 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test/send-email: --[no-]xmailer testslh/send-email-hide-x-mailer | Luis Henriques | 2014-12-15 | 1 | -0/+33 |
| * | | | | | | | | | | | send-email: add --[no-]xmailer option | Luis Henriques | 2014-12-15 | 3 | -3/+14 |
* | | | | | | | | | | | | 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 |