summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* refs DWIMmery: use the same rule for both "git fetch" and othersJunio C Hamano2011-11-071-3/+2
* merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-074-8/+8
* fetch: do not store peeled tag object names in FETCH_HEADLinus Torvalds2011-11-0458-174/+174
* Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-191-0/+23
|\
| * Teach merge the '[-e|--edit]' optionJay Soffian2011-10-121-0/+23
* | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-191-0/+92
|\ \
| * | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-101-0/+92
| |/
* | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-191-0/+15
|\ \
| * \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-061-0/+15
| |\ \
| | * | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-061-0/+15
* | | | Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano2011-10-191-0/+51
|\ \ \ \
| * | | | submodule: Search for merges only at end of recursive mergeBrad King2011-10-131-1/+1
| * | | | submodule: Demonstrate known breakage during recursive mergeBrad King2011-10-131-0/+51
* | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-191-0/+43
|\ \ \ \ \
| * | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-121-0/+43
* | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-191-12/+7
|\ \ \ \ \ \
| * | | | | | t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt2011-10-191-12/+7
* | | | | | | Merge branch 'cb/httpd-test-fix-port'Junio C Hamano2011-10-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | use test number as port numbercb/httpd-test-fix-portClemens Buchacher2011-10-171-1/+1
* | | | | | | | Merge branch 'pt/mingw-misc-fixes'Junio C Hamano2011-10-184-20/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | t9901: fix line-ending dependency on windowsPat Thoyts2011-10-151-15/+12
| * | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGWJohannes Schindelin2011-10-141-4/+4
| * | | | | | | | t9001: do not fail only due to CR/LF issuesJohannes Schindelin2011-10-141-0/+1
| * | | | | | | | t1020: disable the pwd test on MinGWJohannes Schindelin2011-10-141-1/+1
* | | | | | | | | Merge branch 'jk/http-auth'Junio C Hamano2011-10-172-8/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: use hostname in credential descriptionMichael J Gruber2011-10-151-2/+2
| * | | | | | | | | improve httpd auth testsJeff King2011-07-202-8/+53
* | | | | | | | | | Merge branch 'js/check-ref-format-test-mingw'Junio C Hamano2011-10-171-36/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1402-check-ref-format: skip tests of refs beginning with slash on WindowsJohannes Sixt2011-10-131-36/+52
* | | | | | | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-171-83/+120
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | t1300: test mixed-case variable retrievalJeff King2011-10-121-0/+27
| * | | | | | | | | | t1300: put git invocations inside test functionJeff King2011-10-121-83/+93
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bc/attr-ignore-case'Junio C Hamano2011-10-171-1/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-111-1/+58
* | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display'Junio C Hamano2011-10-171-0/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-101-0/+6
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ph/push-to-delete-nothing'Junio C Hamano2011-10-171-0/+197
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooksph/push-to-delete-nothingPang Yan Han2011-09-301-0/+197
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2011-10-171-0/+42
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-301-0/+42
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | resolve_gitlink_packed_ref(): fix mismergeJunio C Hamano2011-10-171-0/+19
* | | | | | | | | | | git svn dcommit: new option --interactive.Frédéric Heitzmann2011-10-161-0/+64
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | send-email: Fix %config_path_settings handlingCord Seele2011-10-141-0/+28
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-141-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1304: fall back to $USER if $LOGNAME is not definedRené Scharfe2011-10-141-0/+5
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-131-1/+33
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-041-1/+33
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | grep: teach --untracked and --exclude-standard optionsJunio C Hamano2011-10-041-1/+33
* | | | | | | | | | | Merge branch 'rs/pending'Junio C Hamano2011-10-131-2/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout: check for "Previous HEAD" notice in t2020René Scharfe2011-10-031-2/+5
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
View Lorry Controller Status