summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* configure.ac: check for HMAC_CTX_cleanuprh/autoconf-rhel3Reuben Hawkins2015-01-093-0/+13
* configure.ac: check for clock_gettime and CLOCK_MONOTONICReuben Hawkins2015-01-094-1/+30
* configure.ac: check 'tv_nsec' field in 'struct stat'Reuben Hawkins2015-01-091-0/+13
* 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
* | | | | | | | | Merge branch 'jc/diff-b-m'Junio C Hamano2015-01-073-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff -B -M: fix output for "copy and then rewrite" caseJunio C Hamano2014-10-233-3/+11
* | | | | | | | | | Merge branch 'jc/clone-borrow'Junio C Hamano2015-01-073-2/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone: --dissociate option to mark that reference is only temporaryjc/clone-borrowJunio C Hamano2014-10-153-2/+46
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/checkout-local-track-report'Junio C Hamano2015-01-072-11/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout: report upstream correctly even with loosely defined branch.*.mergejc/checkout-local-track-reportJunio C Hamano2014-10-142-11/+41
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'for-junio' of git://bogomips.org/git-svnJunio C Hamano2014-12-293-1/+181
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-svn: support for git-svn propsetAlfred Perlstein2014-12-093-1/+181
* | | | | | | | | | | Merge branch 'jc/t9001-modernise'Junio C Hamano2014-12-291-294/+287
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t9001: style modernisation phase #5jc/t9001-moderniseJunio C Hamano2014-11-251-76/+74
| * | | | | | | | | | | t9001: style modernisation phase #4Junio C Hamano2014-11-251-10/+10
| * | | | | | | | | | | t9001: style modernisation phase #3Junio C Hamano2014-11-251-52/+47
| * | | | | | | | | | | t9001: style modernisation phase #2Junio C Hamano2014-11-251-151/+151
| * | | | | | | | | | | t9001: style modernisation phase #1Junio C Hamano2014-11-251-17/+17
* | | | | | | | | | | | Merge branch 'mh/update-ref-verify'Junio C Hamano2014-12-292-9/+97
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update-ref: fix "verify" command with missing <oldvalue>mh/update-ref-verifyMichael Haggerty2014-12-112-11/+7
| * | | | | | | | | | | | t1400: add some more tests of "update-ref --stdin"'s verify commandMichael Haggerty2014-12-111-0/+92
* | | | | | | | | | | | | Sync with maintJunio C Hamano2014-12-222-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Prepare for 2.2.2Junio C Hamano2014-12-222-1/+34
| * | | | | | | | | | | | | Merge branch 'jk/rebuild-perl-scripts-with-no-perl-seting-change' into maintJunio C Hamano2014-12-221-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/no-perl-tests' into maintJunio C Hamano2014-12-223-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \