summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ks/rfc2047-one-char-at-a-time' into maintJunio C Hamano2013-04-034-25/+77
|\
| * format-patch: RFC 2047 says multi-octet character may not be splitKirill Smelkov2013-03-094-25/+77
* | Merge branch 'jk/empty-archive' into maintJunio C Hamano2013-04-036-13/+109
|\ \
| * | archive: handle commits with an empty treeJeff King2013-03-103-1/+103
| * | test-lib: factor out $GIT_UNZIP setupJeff King2013-03-103-12/+6
* | | Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-032-1/+13
|\ \ \
| * | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-132-1/+13
* | | | Merge branch 'lf/setup-prefix-pathspec' into maintJunio C Hamano2013-04-031-5/+7
|\ \ \ \
| * | | | setup.c: check that the pathspec magic ends with ")"Andrew Wong2013-03-141-2/+3
| * | | | setup.c: stop prefix_pathspec() from looping past the end of stringAndrew Wong2013-03-141-3/+4
* | | | | Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-0319-164/+462
|\ \ \ \ \
| * | | | | Start preparing for 1.8.1.6Junio C Hamano2013-04-032-1/+35
| * | | | | Merge branch 'kb/name-hash' into maint-1.8.1Junio C Hamano2013-04-034-62/+166
| |\ \ \ \ \
| | * | | | | name-hash.c: fix endless loop with core.ignorecase=trueKarsten Blees2013-02-274-62/+166
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1Junio C Hamano2013-04-032-1/+14
| |\ \ \ \ \
| | * | | | | Fix revision walk for commits with the same datesKacper Kornet2013-03-222-1/+14
| | |/ / / /
| * | | | | Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1Junio C Hamano2013-04-032-74/+97
| |\ \ \ \ \
| | * | | | | t2003: work around path mangling issue on WindowsJohannes Sixt2013-03-201-2/+2
| | * | | | | entry: fix filter lookupJohn Keeping2013-03-142-1/+27
| | * | | | | t2003: modernize styleJohn Keeping2013-03-141-73/+70
| * | | | | | Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-039-27/+145
| |\ \ \ \ \ \
| | * | | | | | pack-refs: add fully-peeled traitMichael Haggerty2013-03-183-6/+67
| | * | | | | | pack-refs: write peeled entry for non-tagsJeff King2013-03-172-8/+50
| | * | | | | | use parse_object_or_die instead of die("bad object")Jeff King2013-03-173-9/+3
| | * | | | | | avoid segfaults on parse_object failureJeff King2013-03-174-5/+26
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1Junio C Hamano2013-04-032-1/+67
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1Junio C Hamano2013-04-032-1/+26
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-031-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/perl-cat-blob' into maint-1.8.1Junio C Hamano2013-04-031-10/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1Junio C Hamano2013-04-031-0/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-031-4/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-tag(1): we tag HEAD by defaultThomas Rast2013-04-031-0/+6
* | | | | | | | | | | | | Update draft release notes to 1.8.2.1Junio C Hamano2013-04-011-0/+4
* | | | | | | | | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano2013-04-012-1/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | tests: make sure rename pretty print worksAntoine Pelisse2013-03-061-0/+54
| * | | | | | | | | | | | diff: prevent pprint_rename from underrunning inputThomas Rast2013-02-261-7/+10
| * | | | | | | | | | | | diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse2013-02-231-1/+10
* | | | | | | | | | | | | Merge branch 'rr/tests-dedup-test-config' into maintJunio C Hamano2013-04-012-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t4018,7810,7811: remove test_config() redefinitionRamkumar Ramachandra2013-03-193-15/+0
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'yd/doc-is-in-asciidoc' into maintJunio C Hamano2013-04-011-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | CodingGuidelines: our documents are in AsciiDocJunio C Hamano2013-03-211-0/+3
* | | | | | | | | | | | | | Merge branch 'yd/doc-merge-annotated-tag' into maintJunio C Hamano2013-04-012-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Documentation: merging a tag is a special caseJunio C Hamano2013-03-212-1/+26
* | | | | | | | | | | | | | Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-019-4/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy2013-03-168-0/+36
| * | | | | | | | | | | | | | git status: document trade-offs in choosing parameters to the -u optionJunio C Hamano2013-03-151-4/+10
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'da/downcase-u-in-usage' into maintJunio C Hamano2013-04-0125-82/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" stringDavid Aguilar2013-02-241-1/+1
| * | | | | | | | | | | | | | contrib/examples/git-remote.perl: use a lowercase "usage:" stringDavid Aguilar2013-02-241-4/+4
| * | | | | | | | | | | | | | tests: use a lowercase "usage:" stringDavid Aguilar2013-02-245-5/+5
View Lorry Controller Status