summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ld/git-p4-tags-and-labels'Junio C Hamano2012-04-304-3/+206
|\
| * git p4: fix unit testsLuke Diamand2012-04-251-1/+1
| * git p4: Squash P4EDITOR in test harnessLuke Diamand2012-04-241-0/+1
| * git p4: fix-up "import/export of labels to/from p4"Luke Diamand2012-04-241-2/+2
| * git p4: import/export of labels to/from p4Luke Diamand2012-04-111-0/+202
| * git p4: Fixing script editor checksLuke Diamand2012-04-111-2/+2
* | Merge branch 'nh/empty-rebase'Junio C Hamano2012-04-301-1/+24
|\ \
| * | git-cherry-pick: Add test to validate new optionsNeil Horman2012-04-241-1/+24
* | | Merge branch 'jk/maint-config-bogus-section'Junio C Hamano2012-04-301-0/+8
|\ \ \
| * | | config: reject bogus section names for --rename-sectionJeff King2012-04-251-0/+8
| |/ /
* | | Merge branch 'js/daemon-test-race-fix'Junio C Hamano2012-04-291-11/+11
|\ \ \
| * | | t5570: fix forwarding of git-daemon messages via catJohannes Sixt2012-04-271-11/+11
| |/ /
* | | Merge branch 'mm/include-userpath'Junio C Hamano2012-04-291-0/+8
|\ \ \
| * | | config: expand tildes in include.path variableJeff King2012-04-291-0/+8
| |/ /
* | | Merge branch 'pw/t5800-import-race-fix'Junio C Hamano2012-04-291-0/+13
|\ \ \
| * | | git-remote-testgit: fix race when spawning fast-importPete Wyckoff2012-04-241-0/+13
| |/ /
* | | Merge branch 'jk/repack-no-explode-objects-from-old-pack'Junio C Hamano2012-04-291-0/+14
|\ \ \
| * | | gc: do not explode objects which will be immediately prunedJeff King2012-04-111-0/+14
| |/ /
* | | Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano2012-04-273-7/+68
|\ \ \
| * | | fmt-merge-msg: discard needless merge parentsJunio C Hamano2012-04-181-1/+30
| * | | builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-173-3/+3
| * | | merge tests: octopus with redundant parentsMichał Kiedrowicz2012-04-173-7/+39
* | | | Merge branch 'js/fast-import-test-9300'Junio C Hamano2012-04-271-34/+54
|\ \ \ \
| * | | | t9300-fast-import: avoid 'exit' in test_expect_success snippetsJohannes Sixt2012-04-201-34/+54
| | |/ / | |/| |
* | | | Merge branch 'cb/http-multi-curl-auth'Junio C Hamano2012-04-271-5/+10
|\ \ \ \
| * | | | fix http auth with multiple curl handlesJeff King2012-04-101-5/+5
| * | | | http auth fails with multiple curl handlesClemens Buchacher2012-04-101-10/+15
| |/ / /
* | | | Merge branch 'mb/fetch-call-a-non-branch-a-ref'Junio C Hamano2012-04-261-0/+30
|\ \ \ \
| * | | | fetch: describe new refs based on where it came fromMarc Branchaud2012-04-171-0/+30
| | |/ / | |/| |
* | | | Merge branch 'fc/completion-tests'Junio C Hamano2012-04-241-0/+243
|\ \ \ \
| * | | | completion: fix completion after 'git --option <TAB>'SZEDER Gábor2012-04-211-0/+17
| * | | | completion: avoid trailing space for --exec-pathJonathan Nieder2012-04-211-1/+6
| * | | | completion: add missing general optionsFelipe Contreras2012-04-211-0/+16
| * | | | tests: add tests for the __gitcomp() completion helper functionSZEDER Gábor2012-04-211-0/+85
| * | | | tests: add initial bash completion testsFelipe Contreras2012-04-151-0/+120
| | |/ / | |/| |
* | | | Merge branch 'zj/upstream-error-message'Junio C Hamano2012-04-241-3/+78
|\ \ \ \
| * | | | i18n: mark @{upstream} error messages for translationZbigniew Jędrzejewski-Szmek2012-04-151-5/+5
| * | | | Be more specific if upstream branch is not trackedZbigniew Jędrzejewski-Szmek2012-04-151-3/+3
| * | | | Provide better message for barnhc_wiht_tpyo@{u}Zbigniew Jędrzejewski-Szmek2012-04-151-1/+1
| * | | | Provide branch name in error message when using @{u}Zbigniew Jędrzejewski-Szmek2012-04-151-2/+2
| * | | | t1507: add tests to document @{upstream} behaviourZbigniew Jędrzejewski-Szmek2012-04-151-3/+78
| |/ / /
* | | | Merge branch 'it/fetch-pack-many-refs'Junio C Hamano2012-04-242-0/+97
|\ \ \ \
| * | | | remote-curl: main test case for the OS command line overflowIvan Todoroski2012-04-101-0/+31
| * | | | fetch-pack: test cases for the new --stdin optionIvan Todoroski2012-04-101-0/+66
* | | | | Merge branch 'pw/fast-import-dataref-parsing'Junio C Hamano2012-04-241-0/+287
|\ \ \ \ \
| * | | | | fast-import: tighten parsing of datarefsPete Wyckoff2012-04-101-0/+287
| | |_|/ / | |/| | |
* | | | | Merge branch 'hv/submodule-recurse-push'Junio C Hamano2012-04-242-0/+127
|\ \ \ \ \
| * | | | | push: teach --recurse-submodules the on-demand optionHeiko Voigt2012-03-301-0/+94
| * | | | | Teach revision walking machinery to walk multiple times sequenciallyHeiko Voigt2012-03-301-0/+33
* | | | | | Merge branch 'bw/test-fix-grep-gnuism'Junio C Hamano2012-04-231-2/+2
|\ \ \ \ \ \