summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* test: "am -3" can accept non-standard -p<num>jc/am-3-nonstandard-poptJunio C Hamano2012-02-261-0/+15
* am -3: allow nonstandard -p<num> optionJunio C Hamano2012-02-221-4/+7
* Sync with 1.7.6.6Junio C Hamano2012-02-052-24/+2
|\
| * Sync with 1.7.6.6Junio C Hamano2012-02-052-24/+2
| |\
| | * Git 1.7.6.6v1.7.6.6maint-1.7.6Junio C Hamano2012-02-052-2/+3
| | * imap-send: remove dead codeJeff King2012-02-051-23/+0
* | | Git 1.7.8.4v1.7.8.4Junio C Hamano2012-01-183-3/+9
* | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-183-0/+14
|\ \ \ | |/ /
| * | Git 1.7.7.6v1.7.7.6Junio C Hamano2012-01-182-1/+5
| * | diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy2012-01-182-0/+10
* | | Update draft release notes to 1.7.8.4Junio C Hamano2012-01-121-0/+5
* | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-123-2/+17
|\ \ \ | |/ /
| * | Update draft release notes to 1.7.7.6Junio C Hamano2012-01-121-0/+5
| * | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-122-2/+12
| |\ \ | | |/
| | * Update draft release notes to 1.7.6.6Junio C Hamano2012-01-121-0/+5
| | * thin-pack: try harder to use preferred base objects as baseJeff King2012-01-121-2/+7
* | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-112-1/+2
|\ \ \ | |/ /
| * | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-112-1/+2
| |\ \ | | |/
| | * attr: fix leak in free_attr_elemJeff King2012-01-111-0/+1
| | * t2203: fix wrong commit commandNguyễn Thái Ngọc Duy2012-01-111-1/+1
* | | Prepare for 1.7.8.4Junio C Hamano2012-01-102-1/+15
* | | Merge the attributes fix in from maint-1.6.7 branchJunio C Hamano2012-01-105-33/+77
|\ \ \ | |/ /
| * | Prepare for 1.7.7.6Junio C Hamano2012-01-102-1/+12
| * | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-104-33/+66
| |\ \ | | |/
| | * Prepare for 1.7.6.6Junio C Hamano2012-01-102-1/+12
| | * Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano2012-01-101-1/+2
| | * attr.c: clarify the logic to pop attr_stackJunio C Hamano2012-01-101-1/+10
| | * attr.c: make bootstrap_attr_stack() leave earlyJunio C Hamano2012-01-101-30/+31
| | * attr: drop misguided defensive codingJeff King2012-01-101-1/+1
| | * attr: don't confuse prefixes with leading directoriesJeff King2012-01-102-1/+12
* | | send-email: multiedit is a boolean config optionJeff King2012-01-091-1/+1
* | | Git 1.7.8.3v1.7.8.3Junio C Hamano2012-01-064-3/+22
* | | Merge branch 'jn/maint-gitweb-utf8-fix' into maintJunio C Hamano2012-01-061-4/+8
|\ \ \
| * | | gitweb: Fix fallback mode of to_utf8 subroutinejn/maint-gitweb-utf8-fixJakub Narebski2011-12-191-2/+2
| * | | gitweb: Output valid utf8 in git_blame_common('data')Jürgen Kreileder2011-12-181-1/+3
| * | | gitweb: esc_html() site name for title in OPMLJürgen Kreileder2011-12-181-1/+2
| * | | gitweb: Call to_utf8() on input string in chop_and_escape_str()Jürgen Kreileder2011-12-181-0/+1
* | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-061-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-061-4/+4
| |\ \ \ | | | |/ | | |/|
| | * | Documentation: rerere.enabled is the primary way to configure rerereThomas Rast2012-01-061-4/+4
* | | | t5550: repack everything into one fileClemens Buchacher2012-01-041-2/+1
* | | | Merge branch 'nd/maint-parse-depth' into maintJunio C Hamano2012-01-041-2/+6
|\ \ \ \
| * | | | Catch invalid --depth option passed to clone or fetchnd/maint-parse-depthNguyễn Thái Ngọc Duy2012-01-041-2/+6
* | | | | Merge branch 'maint-1.7.7' into maintJunio C Hamano2012-01-033-6/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-032-5/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Documentation: read-tree --prefix works with existing subtreesClemens Buchacher2012-01-011-5/+4
| | * | | Add MYMETA.json to perl/.gitignoreJack Nagel2011-12-291-0/+1
| | |/ /
| * | | docs: describe behavior of relative submodule URLsJens Lehmann2012-01-031-1/+6
* | | | fix hang in git fetch if pointed at a 0 length bundleBrian Harring2012-01-032-2/+8
* | | | Git 1.7.8.2v1.7.8.2Junio C Hamano2011-12-283-2/+73