summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'lf/bundle-with-tip-wo-message'Junio C Hamano2013-04-151-0/+10
|\
| * bundle: Accept prerequisites without commit messagesLukas Fleischer2013-04-071-0/+10
* | Merge branch 'tr/perl-keep-stderr-open'Junio C Hamano2013-04-151-1/+2
|\ \
| * | t9700: do not close STDERRThomas Rast2013-04-041-1/+2
* | | Sync with 'maint'Junio C Hamano2013-04-128-12/+12
|\ \ \
| * \ \ Merge branch 'rr/test-3200-style' into maintJunio C Hamano2013-04-121-253/+267
| |\ \ \
| * \ \ \ Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' into maintJunio C Hamano2013-04-121-3/+3
| |\ \ \ \
| * | | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-128-12/+12
* | | | | | Merge branch 'maint'Junio C Hamano2013-04-114-17/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | t: make PIPE a standard test prerequisiteAdam Spiers2013-04-114-16/+10
| * | | | | t/README: --immediate skips cleanup commands for failed testsSimon Ruderich2013-04-091-1/+4
| * | | | | Sync with 1.8.1.6Junio C Hamano2013-04-071-0/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| |
| | * | | Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1Junio C Hamano2013-04-071-0/+27
| | |\ \ \
| * | \ \ \ Merge branch 'jk/peel-ref' into maintJunio C Hamano2013-04-041-0/+9
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'ap/combine-diff-coalesce-lost'Junio C Hamano2013-04-111-0/+129
|\ \ \ \ \ \ \
| * | | | | | | combine-diff: coalesce lost lines optimallyAntoine Pelisse2013-03-251-0/+129
* | | | | | | | Merge branch 'sr/log-SG-no-textconv'Junio C Hamano2013-04-111-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-pickaxe: respect --no-textconvSimon Ruderich2013-04-051-0/+28
* | | | | | | | | Merge branch 'js/rerere-forget-protect-against-NUL'Junio C Hamano2013-04-111-0/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rerere forget: do not segfault if not all stages are presentJohannes Sixt2013-04-041-0/+13
| * | | | | | | | | rerere forget: grok files containing NULJohannes Sixt2013-04-021-0/+12
* | | | | | | | | | Revert 4b7f53da7618 (simplify-merges: drop merge from irrelevant side branch,...Junio C Hamano2013-04-081-3/+9
* | | | | | | | | | Merge branch 'jk/rm-removed-paths'Junio C Hamano2013-04-071-0/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3600: document failure of rm across symbolic linksJeff King2013-04-041-0/+28
| * | | | | | | | | | t3600: test behavior of reverse-d/f conflictJeff King2013-04-041-0/+12
| * | | | | | | | | | rm: do not complain about d/f conflicts during deletionJeff King2013-04-041-0/+25
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'bc/commit-complete-lines-given-via-m-option' into maintJunio C Hamano2013-04-031-4/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/alias-in-bare' into maintJunio C Hamano2013-04-031-0/+19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/rfc2047-one-char-at-a-time' into maintJunio C Hamano2013-04-031-13/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/empty-archive' into maintJunio C Hamano2013-04-035-12/+108
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/tag-force-no-warn-on-creation' into maintJunio C Hamano2013-04-031-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with 1.8.1 maintenance trackJunio C Hamano2013-04-034-73/+193
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'kb/name-hash' into maint-1.8.1Junio C Hamano2013-04-031-0/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1Junio C Hamano2013-04-031-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1Junio C Hamano2013-04-031-73/+96
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1Junio C Hamano2013-04-031-0/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1Junio C Hamano2013-04-031-0/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano2013-04-011-0/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'rr/tests-dedup-test-config' into maintJunio C Hamano2013-04-012-10/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano2013-04-013-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'da/downcase-u-in-usage' into maintJunio C Hamano2013-04-012-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/triangle'Junio C Hamano2013-04-071-138/+184
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | remote.c: introduce branch.<name>.pushremoteRamkumar Ramachandra2013-04-021-0/+15
| * | | | | | | | | | | | | | | | | | | | | | | remote.c: introduce remote.pushdefaultRamkumar Ramachandra2013-04-021-0/+12
| * | | | | | | | | | | | | | | | | | | | | | | t5516 (fetch-push): drop implicit arguments from helper functionsJeff King2013-04-021-137/+145
| * | | | | | | | | | | | | | | | | | | | | | | t5516 (fetch-push): update test descriptionRamkumar Ramachandra2013-04-021-1/+12
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mm/status-during-revert'Junio C Hamano2013-04-071-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | status: show commit sha1 in "You are currently reverting" messageMatthieu Moy2013-04-021-3/+4
| * | | | | | | | | | | | | | | | | | | | | | | | status: show 'revert' state and status hintMatthieu Moy2013-04-021-0/+57
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/set-upstream-error-cases'Junio C Hamano2013-04-071-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \