summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | builtin-apply: keep information about files to be deletedMichał Kiedrowicz2009-04-151-1/+1
| * | | | | | | | | | tests: test applying criss-cross rename patchMichał Kiedrowicz2009-04-131-0/+38
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/shared-literally'Junio C Hamano2009-04-171-5/+9
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Mark t1301 permission test to depend on POSIXPERMJunio C Hamano2009-04-12132-599/+3041
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | t1301-shared-repo: fix forced modes testJohannes Sixt2009-04-121-4/+8
* | | | | | | | | | Merge branch 'ns/am-to-empty'Junio C Hamano2009-04-171-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-am: teach git-am to apply a patch to an unborn branchNanako Shiraishi2009-04-121-0/+15
* | | | | | | | | | | Merge branch 'bw/short-ref-strict'Junio C Hamano2009-04-171-3/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | for-each-ref: utilize core.warnAmbiguousRefs for :short-formatBert Wesarg2009-04-131-3/+15
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'da/difftool'Junio C Hamano2009-04-171-0/+211
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | difftool: add support for a difftool.prompt config variableDavid Aguilar2009-04-071-0/+64
| * | | | | | | | | | | difftool: add various git-difftool testsDavid Aguilar2009-04-071-0/+147
* | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-04-171-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-171-1/+8
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-171-1/+8
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Fix buffer overflow in config parserThomas Jarosch2009-04-171-1/+8
| | * | | | | | | | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1Junio C Hamano2009-04-081-1/+1
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'jc/shared-literally' into maintJunio C Hamano2009-04-081-0/+37
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2009-04-081-0/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-081-0/+61
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/no-perl'Junio C Hamano2009-04-1211-2/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests: skip perl tests if NO_PERL is definedJeff King2009-04-0811-2/+47
* | | | | | | | | | | | | | Merge branch 'jk/show-upstream'Junio C Hamano2009-04-121-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | for-each-ref: add "upstream" format fieldJeff King2009-04-071-0/+22
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fg/remote-prune'Junio C Hamano2009-04-121-0/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add tests for remote groupsJeff King2009-04-091-0/+81
* | | | | | | | | | | | | | | Merge branch 'cc/bisect-filter'Junio C Hamano2009-04-121-0/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | t6030: test bisecting with pathsChristian Couder2009-04-051-0/+60
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | git-svn: Save init/clone --ignore-paths in configBen Jackson2009-04-111-2/+2
* | | | | | | | | | | | | | git-svn: Add per-svn-remote ignore-paths configBen Jackson2009-04-111-3/+52
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-04-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Change double quotes to single quotes in messageJari Aalto2009-04-071-1/+1
* | | | | | | | | | | | | Merge branch 'bs/maint-1.6.0-tree-walk-prefix'Junio C Hamano2009-04-072-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | match_tree_entry(): a pathspec only matches at directory boundariesJunio C Hamano2009-04-011-0/+6
| * | | | | | | | | | | | tree_entry_interesting: a pathspec only matches at directory boundaryBjörn Steinbrink2009-04-011-0/+8
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/maint-submodule-checkout'Junio C Hamano2009-04-071-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Fix 'git checkout <submodule>' to update the indexJohannes Schindelin2009-04-021-0/+42
* | | | | | | | | | | | Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano2009-04-071-0/+74
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | update cache for conflicting submodule entriesClemens Buchacher2009-04-051-1/+1
| * | | | | | | | | | add tests for merging with submodulesClemens Buchacher2009-04-051-0/+74
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'js/maint-diff-temp-smudge' into maintJunio C Hamano2009-04-021-0/+16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maintJunio C Hamano2009-04-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge branch 'jc/shared-literally'Junio C Hamano2009-04-061-0/+37
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | t1301: loosen test for forced modesJeff King2009-04-011-2/+2
| * | | | | | | | | "core.sharedrepository = 0mode" should set, not loosenJunio C Hamano2009-03-271-0/+37
* | | | | | | | | | Merge branch 'mg/tracked-local-branches'Junio C Hamano2009-04-061-1/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make local branches behave like remote branches when --trackedMichael J Gruber2009-04-011-1/+1
| * | | | | | | | | | Test for local branches being followed with --trackMichael J Gruber2009-03-271-1/+9
* | | | | | | | | | | Merge branch 'sb/format-patch-patchname'Junio C Hamano2009-04-0611-33/+265
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | format-patch: --numbered-files and --stdout aren't mutually exclusiveStephen Boyd2009-03-222-1/+171