aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* merge: record tag objects without peeling in MERGE_HEADJunio C Hamano2011-11-08
* refs DWIMmery: use the same rule for both "git fetch" and othersJunio C Hamano2011-11-07
* merge: notice local merging of tags and keep it unwrappedJunio C Hamano2011-11-07
* fetch: do not store peeled tag object names in FETCH_HEADLinus Torvalds2011-11-04
* Merge branch 'js/merge-edit-option'Junio C Hamano2011-10-19
|\
| * Teach merge the '[-e|--edit]' optionJay Soffian2011-10-12
* | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-19
|\ \
| * | diff: add option to show whole functions as contextRené Scharfe2011-10-10
| |/
* | Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano2011-10-19
|\ \
| * \ Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi...Junio C Hamano2011-10-06
| |\ \
| | * | revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do soJay Soffian2011-10-06
* | | | Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano2011-10-19
|\ \ \ \
| * | | | submodule: Search for merges only at end of recursive mergeBrad King2011-10-13
| * | | | submodule: Demonstrate known breakage during recursive mergeBrad King2011-10-13
* | | | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-19
|\ \ \ \ \
| * | | | | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-12
* | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-19
|\ \ \ \ \ \
| * | | | | | t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt2011-10-19
* | | | | | | Merge branch 'cb/httpd-test-fix-port'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \
| * | | | | | | use test number as port numberClemens Buchacher2011-10-17
* | | | | | | | Merge branch 'pt/mingw-misc-fixes'Junio C Hamano2011-10-18
|\ \ \ \ \ \ \ \
| * | | | | | | | t9901: fix line-ending dependency on windowsPat Thoyts2011-10-15
| * | | | | | | | t9300: do not run --cat-blob-fd related tests on MinGWJohannes Schindelin2011-10-14
| * | | | | | | | t9001: do not fail only due to CR/LF issuesJohannes Schindelin2011-10-14
| * | | | | | | | t1020: disable the pwd test on MinGWJohannes Schindelin2011-10-14
* | | | | | | | | Merge branch 'jk/http-auth'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | http: use hostname in credential descriptionMichael J Gruber2011-10-15
| * | | | | | | | | improve httpd auth testsJeff King2011-07-20
* | | | | | | | | | Merge branch 'js/check-ref-format-test-mingw'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1402-check-ref-format: skip tests of refs beginning with slash on WindowsJohannes Sixt2011-10-13
* | | | | | | | | | | Merge branch 'jk/config-test-cleanup'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | t1300: test mixed-case variable retrievalJeff King2011-10-12
| * | | | | | | | | | t1300: put git invocations inside test functionJeff King2011-10-12
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bc/attr-ignore-case'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-11
* | | | | | | | | | | Merge branch 'mm/maint-config-explicit-bool-display'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: display key_delim for config --bool --get-regexpMatthieu Moy2011-10-10
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ph/push-to-delete-nothing'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | receive-pack: don't pass non-existent refs to post-{receive,update} hooksPang Yan Han2011-09-30
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/checkout-from-tree-keep-local-changes'Junio C Hamano2011-10-17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout $tree $path: do not clobber local changes in $path not in $treeJunio C Hamano2011-09-30
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | resolve_gitlink_packed_ref(): fix mismergeJunio C Hamano2011-10-17
* | | | | | | | | | | git svn dcommit: new option --interactive.Frédéric Heitzmann2011-10-16
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | send-email: Fix %config_path_settings handlingCord Seele2011-10-14
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-10-14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t1304: fall back to $USER if $LOGNAME is not definedRené Scharfe2011-10-14
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/grep-untracked-exclude'Junio C Hamano2011-10-13
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-excludeJunio C Hamano2011-10-04
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | grep: teach --untracked and --exclude-standard optionsJunio C Hamano2011-10-04
* | | | | | | | | | | Merge branch 'rs/pending'Junio C Hamano2011-10-13
|\ \ \ \ \ \ \ \ \ \ \