summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kb/p4merge'Junio C Hamano2013-03-264-35/+52
|\
| * merge-one-file: force content conflict for "both sides added" caseJunio C Hamano2013-03-251-5/+2
| * git-merge-one-file: send "ERROR:" messages to stderrKevin Bracey2013-03-251-7/+7
| * git-merge-one-file: style cleanupKevin Bracey2013-03-251-9/+17
| * merge-one-file: remove stale commentJunio C Hamano2013-03-251-2/+0
| * mergetools/p4merge: create a base if none availableKevin Bracey2013-03-134-14/+28
| * mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey2013-03-131-1/+1
* | Merge branch 'maint'Junio C Hamano2013-03-262-3/+45
|\ \
| * | More corrections for 1.8.2.1Junio C Hamano2013-03-261-0/+39
| * | Merge branch 'maint-1.8.1' into maintJunio C Hamano2013-03-261-3/+6
| |\ \
| | * | Correct the docs about GIT_SSH.Dan Bornstein2013-03-261-3/+6
| * | | Merge branch 'we/submodule-update-prefix-output' into maintJunio C Hamano2013-03-262-14/+20
| |\ \ \
| * \ \ \ Merge branch 'jk/mailsplit-maildir-muttsort' into maintJunio C Hamano2013-03-261-0/+23
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/zip-compresssed-size-with-export-subst' into maintJunio C Hamano2013-03-262-1/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/utf-8-can-be-spelled-differently' into maintJunio C Hamano2013-03-261-2/+18
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/branch-error-cases' into maintJunio C Hamano2013-03-262-0/+48
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ap/maint-update-index-h-is-for-help' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/perl-cat-blob' into maintJunio C Hamano2013-03-261-10/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ob/imap-send-ssl-verify' into maintJunio C Hamano2013-03-261-0/+11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-l10n-buf-overflow' into maintJunio C Hamano2013-03-261-4/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-push-refspec-default-doc' into maintJunio C Hamano2013-03-261-9/+14
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'wk/user-manual-literal-format' into maintJunio C Hamano2013-03-261-142/+144
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maintJunio C Hamano2013-03-263-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-reflog-expire-clean-mark-typofix' into maintJunio C Hamano2013-03-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Second wave of topics toward 1.8.3Junio C Hamano2013-03-251-7/+58
* | | | | | | | | | | | | | | | | Merge branch 'jk/fully-peeled-packed-ref'Junio C Hamano2013-03-259-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 'jk/fast-export-object-lookup'Junio C Hamano2013-03-251-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fast-export: do not load blob objects twiceJeff King2013-03-171-6/+10
| * | | | | | | | | | | | | | | | | | fast-export: rename handle_object functionJeff King2013-03-171-3/+3
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/peel-ref'Junio C Hamano2013-03-252-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | upload-pack: load non-tip "want" objects from diskJeff King2013-03-161-2/+2
| * | | | | | | | | | | | | | | | | | | upload-pack: make sure "want" objects are parsedJeff King2013-03-162-1/+10
| * | | | | | | | | | | | | | | | | | | upload-pack: drop lookup-before-parse optimizationJeff King2013-03-161-3/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'lf/setup-prefix-pathspec'Junio C Hamano2013-03-251-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
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'ph/tag-force-no-warn-on-creation'Junio C Hamano2013-03-252-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | tag: --force does not have to warn when creating tagsPhil Hord2013-03-132-1/+13
* | | | | | | | | | | | | | | | | | | | | Merge branch 'mg/unsigned-time-t'Junio C Hamano2013-03-251-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix time offset calculation in case of unsigned time_tMike Gorchak2013-02-251-2/+8
| * | | | | | | | | | | | | | | | | | | | | date.c: fix unsigned time_t comparisonMike Gorchak2013-02-251-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/suppress-clang-warning'Junio C Hamano2013-03-252-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fix clang -Wtautological-compare with unsigned enumAntoine Pelisse2013-02-252-2/+4
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pw/p4-symlinked-root'Junio C Hamano2013-03-252-7/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git p4: avoid expanding client paths in chdirMiklós Fazekas2013-03-112-8/+23
| * | | | | | | | | | | | | | | | | | | | | | | git p4 test: should honor symlink in p4 client rootPete Wyckoff2013-03-111-0/+27