summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maintJunio C Hamano2013-02-271-3/+4
|\
| * user-manual: typofix (ofthe->of the)Junio C Hamano2013-02-181-1/+1
| * user-manual: Update for receive.denyCurrentBranch=refuseW. Trevor King2013-02-141-3/+4
* | Merge branch 'jn/less-reconfigure' into maintJunio C Hamano2013-02-271-6/+8
|\ \
| * | Makefile: avoid infinite loop on configure.ac changeJeff King2013-02-201-6/+8
* | | Documentation/submodule: Add --force to update synopsisBrad King2013-02-271-1/+1
* | | Prepare for 1.8.1.5Junio C Hamano2013-02-252-1/+38
* | | Merge branch 'jc/mention-tracking-for-pull-default' into maintJunio C Hamano2013-02-251-1/+2
|\ \ \
| * | | doc: mention tracking for pull.defaultJunio C Hamano2013-01-311-1/+2
| | |/ | |/|
* | | Merge branch 'mm/config-intro-in-git-doc' into maintJunio C Hamano2013-02-251-6/+5
|\ \ \
| * | | git.txt: update description of the configuration mechanismMatthieu Moy2013-02-151-6/+5
* | | | Merge branch 'da/p4merge-mktemp-fix' into maintJunio C Hamano2013-02-251-1/+1
|\ \ \ \
| * | | | p4merge: fix printf usageDavid Aguilar2013-02-101-1/+1
* | | | | Merge branch 'bw/get-tz-offset-perl' into maintJunio C Hamano2013-02-254-13/+35
|\ \ \ \ \
| * | | | | cvsimport: format commit timestamp ourselves without using strftimeBen Walton2013-02-091-1/+4
| * | | | | perl/Git.pm: fix get_tz_offset to properly handle DST boundary casesBen Walton2013-02-091-3/+3
| * | | | | Move Git::SVN::get_tz to Git::get_tz_offsetBen Walton2013-02-093-12/+31
* | | | | | Merge branch 'al/mergetool-printf-fix' into maintJunio C Hamano2013-02-252-2/+2
|\ \ \ \ \ \
| * | | | | | difftool--helper: fix printf usageDavid Aguilar2013-02-101-1/+1
| * | | | | | git-mergetool: print filename when it contains %Asheesh Laroia2013-02-081-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jx/utf8-printf-width' into maintJunio C Hamano2013-02-253-2/+25
|\ \ \ \ \ \
| * | | | | | Add utf8_fprintf helper that returns correct number of columnsJiang Xin2013-02-113-2/+25
* | | | | | | Merge branch 'mg/bisect-doc' into maintJunio C Hamano2013-02-251-1/+6
|\ \ \ \ \ \ \
| * | | | | | | git-bisect.txt: clarify that reset quits bisectMichael J Gruber2013-02-111-1/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sp/smart-http-content-type-check' into maintJunio C Hamano2013-02-258-17/+59
|\ \ \ \ \ \ \
| * | | | | | | http_request: reset "type" strbuf before addingJeff King2013-02-061-0/+1
| * | | | | | | t5551: fix expected error outputJunio C Hamano2013-02-041-2/+1
| * | | | | | | Verify Content-Type from smart HTTP serversShawn Pearce2013-02-048-17/+59
* | | | | | | | Merge branch 'jc/combine-diff-many-parents' into maintJunio C Hamano2013-02-252-14/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | t4038: add tests for "diff --cc --raw <trees>"John Keeping2013-02-051-0/+24
| * | | | | | | | combine-diff: lift 32-way limit of combined diffJunio C Hamano2013-02-031-14/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/apply-similaritly-parsing' into maintJunio C Hamano2013-02-251-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-031-4/+6
| |/ / / / / / /
* | | | | | | | Merge branch 'jk/remote-helpers-doc' into maintJunio C Hamano2013-02-255-7/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename {git- => git}remote-helpers.txtJohn Keeping2013-02-015-7/+23
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ab/gitweb-use-same-scheme' into maintJunio C Hamano2013-02-251-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: refer to picon/gravatar images over the same schemeAndrej E Baranov2013-01-281-2/+2
* | | | | | | | | Merge branch 'zk/clean-report-failure' into maintJunio C Hamano2013-02-251-29/+125
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-clean: Display more accurate delete messagesZoltan Klinger2013-01-141-29/+125
* | | | | | | | | | Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maintJunio C Hamano2013-02-251-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone: forbid --bare --separate-git-dir <dir>Nguyễn Thái Ngọc Duy2013-01-101-0/+2
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'da/p4merge-mktemp' into maintJunio C Hamano2013-02-251-14/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar2012-12-261-14/+13
* | | | | | | | | | Documentation: "advice" is uncountableGreg Price2013-02-252-2/+2
* | | | | | | | | | Git 1.8.1.4v1.8.1.4Junio C Hamano2013-02-194-3/+15
* | | | | | | | | | Merge branch 'ob/imap-send-ssl-verify' into maintJunio C Hamano2013-02-191-2/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | imap-send: support subjectAltName as wellOswald Buddenhagen2013-02-191-0/+19
| * | | | | | | | | | imap-send: the subject of SSL certificate must match the hostOswald Buddenhagen2013-02-191-0/+39
| * | | | | | | | | | imap-send: move #ifdef aroundJunio C Hamano2013-02-181-2/+7
* | | | | | | | | | | user-manual: use -o latest.tar.gz to create a gzipped tarballW. Trevor King2013-02-181-3/+12