summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | 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 'yd/doc-merge-annotated-tag' into maint-1.8.1Junio C Hamano2013-04-032-1/+26
|\ \ \
| * | | Documentation: merging a tag is a special caseJunio C Hamano2013-03-212-1/+26
* | | | Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1Junio C Hamano2013-04-031-1/+1
|\ \ \ \
| * | | | update-index: allow "-h" to also display optionsAntoine Pelisse2013-02-231-1/+1
* | | | | Merge branch 'jc/perl-cat-blob' into maint-1.8.1Junio C Hamano2013-04-031-10/+7
|\ \ \ \ \
| * | | | | Git.pm: fix cat_blob crashes on large filesJoshua Clayton2013-02-221-10/+7
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1Junio C Hamano2013-04-031-0/+11
|\ \ \ \ \
| * | | | | imap-send: support Server Name Indication (RFC4366)Junio C Hamano2013-02-201-0/+11
* | | | | | Merge branch 'nd/index-pack-l10n-buf-overflow' into maint-1.8.1Junio C Hamano2013-04-031-4/+5
|\ \ \ \ \ \
| * | | | | | index-pack: fix buffer overflow caused by translationsNguyễn Thái Ngọc Duy2013-03-161-4/+5
* | | | | | | git-tag(1): we tag HEAD by defaultThomas Rast2013-04-031-0/+6
* | | | | | | git help config: s/insn/instruction/Matthias Krüger2013-03-281-1/+1
* | | | | | | merge-tree: fix typo in merge-tree.c::unresolvedJohn Keeping2013-03-271-1/+1
* | | | | | | git-commit doc: describe use of multiple `-m` optionsChristian Helmuth2013-03-271-0/+2
* | | | | | | git-pull doc: fix grammo ("conflicts" is plural)Mihai Capotă2013-03-271-1/+1
* | | | | | | Correct the docs about GIT_SSH.Dan Bornstein2013-03-261-3/+6
* | | | | | | Merge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1Junio C Hamano2013-03-251-5/+5
|\ \ \ \ \ \ \
| * | | | | | | bundle: Add colons to list headings in "verify"Lukas Fleischer2013-03-081-4/+4
| * | | | | | | bundle: Fix "verify" output if history is completeLukas Fleischer2013-03-071-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'tk/doc-filter-branch' into maint-1.8.1Junio C Hamano2013-03-251-2/+25
|\ \ \ \ \ \ \
| * | | | | | | Documentation: filter-branch env-filter exampleTadeusz Andrzej Kadłubowski2013-02-261-0/+20
| * | | | | | | git-filter-branch.txt: clarify ident variables usageTadeusz Andrzej Kadłubowski2013-02-261-2/+5
* | | | | | | | Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1Junio C Hamano2013-03-252-4/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | git-compat-util.h: Provide missing netdb.h definitionsDavid Michael2013-02-252-4/+11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1Junio C Hamano2013-03-251-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | describe: Document --match pattern formatGreg Price2013-02-241-2/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/doc-index-format' into maint-1.8.1Junio C Hamano2013-03-253-5/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | update-index: list supported idx versions and their featuresNguyễn Thái Ngọc Duy2013-02-231-1/+9
| * | | | | | | | read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()Nguyễn Thái Ngọc Duy2013-02-221-1/+1
| * | | | | | | | index-format.txt: mention of v4 is missing in some placesNguyễn Thái Ngọc Duy2013-02-221-3/+3
| |/ / / / / / /
* | | | | | | | Merge branch 'wk/doc-pre-rebase' into maint-1.8.1Junio C Hamano2013-03-251-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/githooks: Explain pre-rebase parametersW. Trevor King2013-02-241-3/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/color-diff-doc' into maint-1.8.1Junio C Hamano2013-03-251-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-options: unconfuse description of --colorJunio C Hamano2013-02-221-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | t1507: Test that branchname@{upstream} is interpreted as branchKacper Kornet2013-03-171-0/+4
* | | | | | | | rev-parse: clarify documentation of $name@{upstream} syntaxKacper Kornet2013-03-171-4/+4
* | | | | | | | sha1_name: pass object name length to diagnose_invalid_sha1_path()René Scharfe2013-03-171-18/+14
* | | | | | | | Makefile: keep LIB_H entries together and sortedRené Scharfe2013-03-161-16/+13
* | | | | | | | git.c: make usage match manual pageKevin Bracey2013-03-111-2/+2
* | | | | | | | Translate git_more_info_string consistentlyKevin Bracey2013-03-101-1/+1
* | | | | | | | perf: update documentation of GIT_PERF_REPEAT_COUNTAntoine Pelisse2013-03-091-1/+1