summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2008-10-173-1/+35
|\
| * t1301-shared-repo.sh: don't let a default ACL interfere with the testMatt McCutchen2008-10-161-0/+3
| * xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-161-1/+1
| * t4018-diff-funcname: demonstrate end of line funcname matching flawBrandon Casey2008-10-161-0/+6
| * t4018-diff-funcname: rework negated last expression testBrandon Casey2008-10-161-1/+2
| * Add testcase to ensure merging an early part of a branch is done properlyMiklos Vajna2008-10-141-0/+26
* | t4018-diff-funcname: add objective-c xfuncname pattern to syntax testBrandon Casey2008-10-141-1/+1
* | tests: shell negation portability fixJeff King2008-10-131-1/+1
* | Merge branch 'maint'Shawn O. Pearce2008-10-122-1/+53
|\ \ | |/
| * test-lib: fix broken printfShawn O. Pearce2008-10-121-1/+1
| * git apply --directory broken for new filesJeff King2008-10-121-0/+52
* | "git diff <tree>{3,}": do not reverse order of argumentsMatt McCutchen2008-10-122-0/+30
* | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey2008-10-121-1/+1
* | Merge branch 'maint'Shawn O. Pearce2008-10-102-1/+13
|\ \ | |/
| * rebase -i: do not fail when there is no commit to cherry-pickJohannes Schindelin2008-10-101-0/+11
| * test-lib: fix color reset in say_color()Miklos Vajna2008-10-101-1/+2
* | Merge branch 'dm/svn-branch'Shawn O. Pearce2008-10-091-0/+59
|\ \
| * | Add git-svn branch to allow branch creation in SVN repositoriesFlorian Ragwitz2008-10-061-0/+59
* | | Merge branch 'jc/add-ita'Shawn O. Pearce2008-10-091-0/+36
|\ \ \
| * | | git-add --intent-to-add (-N)Junio C Hamano2008-08-311-0/+36
* | | | Merge branch 'mv/merge-refresh'Shawn O. Pearce2008-10-091-0/+9
|\ \ \ \
| * | | | builtin-merge: refresh the index before calling a strategyMiklos Vajna2008-10-031-0/+9
* | | | | Merge branch 'maint'Shawn O. Pearce2008-10-082-8/+49
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | git init: --bare/--shared overrides system/global configDeskin Miller2008-10-081-0/+32
| * | | git rm: refresh index before up-to-date checkJohannes Schindelin2008-10-081-8/+17
* | | | Merge branch 'maint'Shawn O. Pearce2008-10-062-0/+147
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Teach rebase -i to honor pre-rebase hookNanako Shiraishi2008-10-061-0/+126
| * | fix bogus "diff --git" header from "diff --no-index"Linus Torvalds2008-10-061-0/+21
* | | tests: add a testcase for "git submodule sync"David Aguilar2008-10-021-0/+64
* | | Merge branch 'maint'Shawn O. Pearce2008-10-021-0/+49
|\ \ \ | |/ /
| * | gitweb: Add path_info tests to t/t9500-gitweb-standalone-no-errors.shJakub Narebski2008-10-021-0/+49
* | | Merge branch 'maint'Shawn O. Pearce2008-09-301-0/+0
|\ \ \ | |/ /
| * | t0024: add executable permissionSZEDER Gábor2008-09-301-0/+0
* | | tests: grep portability fixesJeff King2008-09-308-11/+11
* | | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-1/+12
|\ \ \
| * \ \ Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-298-13/+324
| |\ \ \ | | |/ /
| | * | Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-291-1/+12
| | |\ \
| * | | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-231-1/+1
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-221-0/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | t4018-diff-funcname: test syntax of builtin xfuncname patternsBrandon Casey2008-09-221-0/+11
| * | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-185-17/+60
| |\ \ \ \ | | |/ / /
| | * | | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-181-1/+1
* | | | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-292-2/+165
|\ \ \ \ \
| * | | | | checkout --conflict=<style>: recreate merge in a non-default styleJunio C Hamano2008-08-311-46/+54
| * | | | | checkout -m: recreate merge when checking out of unmerged indexJunio C Hamano2008-08-301-0/+63
| * | | | | Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'Junio C Hamano2008-08-301-0/+70
| |\ \ \ \ \
| | * | | | | checkout --ours/--theirs: allow checking out one side of a conflicting mergeJunio C Hamano2008-08-301-0/+25
| | * | | | | checkout -f: allow ignoring unmerged paths when checking out of the indexJunio C Hamano2008-08-301-0/+23
| * | | | | | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-301-1/+8
| * | | | | | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-301-0/+37
View Lorry Controller Status