summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.8.0.1v1.8.0.1Junio C Hamano2012-11-253-3/+16
* Merge branch 'jk/checkout-out-of-unborn' into maintJunio C Hamano2012-11-251-0/+3
|\
| * checkout: print a message when switching unborn branchesJeff King2012-11-151-0/+3
* | Merge branch 'cn/config-missing-path' into maintJunio C Hamano2012-11-252-1/+7
|\ \
| * | config: don't segfault when given --path with a missing valueCarlos Martín Nieto2012-11-152-1/+7
* | | Merge branch 'jk/maint-gitweb-xss' into maintJunio C Hamano2012-11-252-0/+16
|\ \ \
| * | | gitweb: escape html in rss titleJeff King2012-11-122-0/+16
* | | | Completion must sort before using uniqMarc Khouzam2012-11-241-1/+1
* | | | Further preparation for 1.8.0.1Junio C Hamano2012-11-201-1/+7
* | | | Merge branch 'mg/maint-pull-suggest-upstream-to' into maintJunio C Hamano2012-11-201-1/+1
|\ \ \ \
| * | | | push/pull: adjust missing upstream help text to changed interfaceMichael J Gruber2012-11-081-1/+1
| |/ / /
* | | | Merge branch 'mm/maint-doc-commit-edit' into maintJunio C Hamano2012-11-201-0/+5
|\ \ \ \
| * | | | Document 'git commit --no-edit' explicitlyMatthieu Moy2012-11-021-0/+5
| |/ / /
* | | | Merge branch 'as/maint-doc-fix-no-post-rewrite' into maintJunio C Hamano2012-11-201-4/+3
|\ \ \ \
| * | | | commit: fixup misplacement of --no-post-rewrite descriptionAndreas Schwab2012-11-021-4/+3
* | | | | Merge branch 'rs/lock-correct-ref-during-delete' into maintJunio C Hamano2012-11-201-13/+5
|\ \ \ \ \
| * | | | | refs: lock symref that is to be deleted, not its targetRené Scharfe2012-10-161-13/+5
* | | | | | Merge branch 'rf/maint-mailmap-off-by-one' into maintJunio C Hamano2012-11-201-1/+1
|\ \ \ \ \ \
| * | | | | | mailmap: avoid out-of-bounds memory accessRomain Francoise2012-10-281-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jk/maint-diff-grep-textconv' into maintJunio C Hamano2012-11-202-2/+14
|\ \ \ \ \ \
| * | | | | | diff_grep: use textconv buffers for add/deleted filesJeff King2012-10-282-2/+14
| |/ / / / /
* | | | | | Merge branch 'js/format-2047' into maintJunio C Hamano2012-11-205-126/+262
|\ \ \ \ \ \
| * | | | | | format-patch tests: check quoting/encoding in To: and Cc: headersJan H. Schönherr2012-10-181-32/+66
| * | | | | | format-patch: fix rfc2047 address encoding with respect to rfc822 specialsJan H. Schönherr2012-10-182-18/+33
| * | | | | | format-patch: make rfc2047 encoding more strictJan H. Schönherr2012-10-183-12/+72
| * | | | | | format-patch: introduce helper function last_line_length()Jan H. Schönherr2012-10-181-12/+13
| * | | | | | format-patch: do not wrap rfc2047 encoded headers too lateJan H. Schönherr2012-10-182-33/+51
| * | | | | | format-patch: do not wrap non-rfc2047 headers too earlyJan H. Schönherr2012-10-182-27/+35
| * | | | | | utf8: fix off-by-one wrapping of textJan H. Schönherr2012-10-182-3/+3
* | | | | | | Start preparing for 1.8.0.1Junio C Hamano2012-11-182-1/+47
* | | | | | | Merge branch 'sz/maint-curl-multi-timeout' into maintJunio C Hamano2012-11-181-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Fix potential hang in https handshakeStefan Zager2012-10-191-0/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'po/maint-refs-replace-docs' into maintJunio C Hamano2012-11-181-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Doc repository-layout: Show refs/replacePhilip Oakley2012-10-251-0/+6
| |/ / / / / /
* | | | | | | Merge branch 'ph/pull-rebase-detached' into maintJunio C Hamano2012-11-181-0/+1
|\ \ \ \ \ \ \
| * | | | | | | git-pull: Avoid merge-base on detached headPhil Hord2012-10-251-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'mm/maint-doc-remote-tracking' into maintJunio C Hamano2012-11-184-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy2012-10-254-6/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs/branch-del-symref' into maintJunio C Hamano2012-11-182-26/+68
|\ \ \ \ \ \ \
| * | | | | | | branch: show targets of deleted symrefs, not sha1sRené Scharfe2012-10-182-11/+13
| * | | | | | | branch: skip commit checks when deleting symref branchesRené Scharfe2012-10-182-2/+17
| * | | | | | | branch: delete symref branch, not its targetRené Scharfe2012-10-182-1/+12
| * | | | | | | branch: factor out delete_branch_config()René Scharfe2012-10-181-5/+10
| * | | | | | | branch: factor out check_branch_commit()René Scharfe2012-10-181-12/+21
* | | | | | | | Merge branch 'nd/grep-true-path' into maintJunio C Hamano2012-11-184-17/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: stop looking at random places for .gitattributesNguyễn Thái Ngọc Duy2012-10-124-17/+51
* | | | | | | | | Merge branch 'jc/grep-pcre-loose-ends' (early part) into maintJunio C Hamano2012-11-185-128/+204
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | log --grep: use the same helper to set -E/-F options as "git grep"Junio C Hamano2012-10-092-2/+8
| * | | | | | | | | revisions: initialize revs->grep_filter using grep_init()Junio C Hamano2012-10-092-2/+9
| * | | | | | | | | grep: move pattern-type bits support to top-level grep.[ch]Junio C Hamano2012-10-093-39/+45