summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fourth batch for 2.3 cycleJunio C Hamano2015-01-071-0/+82
* Merge branch 'maint'Junio C Hamano2015-01-072-12/+35
|\
| * Merge branch 'maint-2.1' into maintJunio C Hamano2015-01-072-12/+35
| |\
| | * Merge branch 'maint-2.0' into maint-2.1maint-2.1Junio C Hamano2015-01-072-12/+35
| | |\
| | | * Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-072-12/+35
| | | |\
| | | | * Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-072-12/+35
| | | | |\
| | | | | * Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-072-12/+35
| | | | | |\
| | | | | | * is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5Jeff King2014-12-292-12/+35
* | | | | | | Merge branch 'bw/maint-0090-awk-tweak'Junio C Hamano2015-01-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t0090: tweak awk statement for Solaris /usr/xpg4/bin/awkbw/maint-0090-awk-tweakBen Walton2014-12-231-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'jh/pre-push-sample-no-custom-ifs'Junio C Hamano2015-01-071-1/+0
|\ \ \ \ \ \ \
| * | | | | | | pre-push.sample: remove unnecessary and misleading IFS=' 'jh/pre-push-sample-no-custom-ifsJim Hill2014-12-221-1/+0
* | | | | | | | Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano2015-01-071-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | git-prompt: preserve value of $? inside shell promptTony Finch2014-12-221-0/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'sb/dco-indentation-fix'Junio C Hamano2015-01-071-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/SubmittingPatches: unify whitespace/tabs for the DCOsb/dco-indentation-fixStefan Beller2014-12-221-6/+6
* | | | | | | | | Merge branch 'bb/update-unicode-table'Junio C Hamano2015-01-071-7/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update_unicode.sh: delete the command groupbb/update-unicode-tableBeat Bolli2014-12-221-12/+11
| * | | | | | | | | update_unicode.sh: make the output structure visibleBeat Bolli2014-12-221-7/+9
| * | | | | | | | | update_unicode.sh: shorten uniset invocation pathBeat Bolli2014-12-221-2/+2
| * | | | | | | | | update_unicode.sh: set UNICODE_DIR only onceBeat Bolli2014-12-221-2/+3
| * | | | | | | | | update_unicode.sh: simplify output captureBeat Bolli2014-12-221-8/+9
| |/ / / / / / / /
* | | | | | | | | Merge branch 'es/squelch-openssl-warnings-on-macosx'Junio C Hamano2015-01-071-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-compat-util: suppress unavoidable Apple-specific deprecation warningsEric Sunshine2014-12-181-0/+4
* | | | | | | | | | Merge branch 'sb/t5400-remove-unused'Junio C Hamano2015-01-071-15/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5400: remove dead codesb/t5400-remove-unusedStefan Beller2014-12-161-15/+1
* | | | | | | | | | | Merge branch 'lh/send-email-hide-x-mailer'Junio C Hamano2015-01-074-3/+47
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test/send-email: --[no-]xmailer testslh/send-email-hide-x-mailerLuis Henriques2014-12-151-0/+33
| * | | | | | | | | | | send-email: add --[no-]xmailer optionLuis Henriques2014-12-153-3/+14
* | | | | | | | | | | | Merge branch 'rd/send-email-2047-fix'Junio C Hamano2015-01-072-11/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | send-email: handle adjacent RFC 2047-encoded words properlyrd/send-email-2047-fixРоман Донченко2014-12-152-10/+23
| * | | | | | | | | | | | send-email: align RFC 2047 decoding more closely with the specРоман Донченко2014-12-151-11/+19
* | | | | | | | | | | | | Merge branch 'pd/completion-filenames-fix'Junio C Hamano2015-01-072-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update documentation occurrences of filename .shpd/completion-filenames-fixPeter van der Does2014-12-152-3/+3
* | | | | | | | | | | | | | Merge branch 'jk/add-i-read-error'Junio C Hamano2015-01-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add--interactive: leave main loop on read errorjk/add-i-read-errorJeff King2014-12-151-0/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates'Junio C Hamano2015-01-072-9/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | approxidate: allow ISO-like dates far in the futurejk/approxidate-avoid-y-d-m-over-future-datesJeff King2014-11-132-2/+5
| * | | | | | | | | | | | | | pass TIME_DATE_NOW to approxidate future-checkJeff King2014-11-131-7/+10
* | | | | | | | | | | | | | | Merge branch 'br/imap-send-via-libcurl'Junio C Hamano2015-01-074-37/+191
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | git-imap-send: use libcurl for implementationbr/imap-send-via-libcurlBernhard Reiter2014-11-104-37/+191
* | | | | | | | | | | | | | | | Merge branch 'br/imap-send-verbosity'Junio C Hamano2015-01-072-11/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | imap-send: use parse options API to determine verbositybr/imap-send-verbosityBernhard Reiter2014-11-052-11/+31
* | | | | | | | | | | | | | | | Merge branch 'nd/lockfile-absolute'Junio C Hamano2015-01-072-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | lockfile.c: store absolute pathnd/lockfile-absoluteNguyễn Thái Ngọc Duy2014-11-032-3/+26
* | | | | | | | | | | | | | | | | Merge branch 'jc/merge-bases'Junio C Hamano2015-01-0711-22/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | get_merge_bases(): always clean-up object flagsjc/merge-basesJunio C Hamano2014-10-3011-22/+38
| * | | | | | | | | | | | | | | | | bisect: clean flags after checking merge basesJunio C Hamano2014-10-301-1/+1
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'Junio C Hamano2015-01-072-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | strbuf_add_commented_lines(): avoid SP-HT sequence in commented linesjc/strbuf-add-lines-avoid-sp-ht-sequenceJunio C Hamano2014-10-272-1/+8