summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-261-0/+11
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Remove empty directories in recursive mergeAlex Riesen2008-09-261-0/+11
* | | | | | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-251-0/+22
|\ \ \ \ \ \
| * | | | | | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-061-0/+22
* | | | | | | Merge branch 'am/status'Shawn O. Pearce2008-09-251-0/+10
|\ \ \ \ \ \ \
| * | | | | | | wt-status: Teach how to discard changes in the working directoryAnders Melchiorsen2008-09-071-0/+10
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-251-0/+53
|\ \ \ \ \ \ \
| * | | | | | | t7603: add new testcases to ensure builtin-commit uses reduce_heads()Miklos Vajna2008-09-101-0/+53
* | | | | | | | Merge branch 'maint'Shawn O. Pearce2008-09-251-0/+10
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | maint: check return of split_cmdline to avoid bad config stringsDeskin Miller2008-09-241-0/+10
* | | | | | | | git-svn: do a partial rebuild if rev_map is out-of-dateDeskin Miller2008-09-211-1/+1
* | | | | | | | git-svn: testcase for partial rebuildDeskin Miler2008-09-211-0/+59
* | | | | | | | Merge branch 'db/maint-checkout-b'Junio C Hamano2008-09-211-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Check early that a new branch is new and validDaniel Barkalow2008-09-211-0/+10
| |/ / / / / / /
* | | | | | | | t5510: test "git fetch" following tags minimallyJunio C Hamano2008-09-211-0/+20
* | | | | | | | Merge branch 'maint'Junio C Hamano2008-09-185-13/+287
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Make git archive respect core.autocrlf when creating zip format archivesCharles Bailey2008-09-181-1/+1
| * | | | | | | Add new test to demonstrate git archive core.autocrlf inconsistencyCharles Bailey2008-09-181-0/+46
| * | | | | | | git-svn: fix handling of even funkier branch namesEric Wong2008-09-181-0/+16
| * | | | | | | git-svn: Always create a new RA when calling do_switch for svn://Alec Berryman2008-09-182-0/+223
| * | | | | | | git-svn: factor out svnserve test code for later useAlec Berryman2008-09-182-13/+18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'np/pack'Junio C Hamano2008-09-181-1/+2
|\ \ \ \ \ \ \
| * | | | | | | t5300: improve SHA1 collision testNicolas Pitre2008-09-021-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'bw/shortref'Junio C Hamano2008-09-181-0/+44
|\ \ \ \ \ \ \
| * | | | | | | for-each-ref: `:short` format for `refname`Bert Wesarg2008-09-051-0/+44
* | | | | | | | Merge branch 'tr/rev-list-reverse'Junio C Hamano2008-09-181-0/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | t6013: replace use of 'tac' with equivalent PerlThomas Rast2008-08-311-2/+2
| * | | | | | | | rev-list: fix --reverse interaction with --parentsThomas Rast2008-08-291-0/+42
* | | | | | | | | Merge branch 'cc/bisect'Junio C Hamano2008-09-181-0/+114
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bisect: only check merge bases when neededChristian Couder2008-08-271-0/+24
| * | | | | | | | | bisect: test merge base if good rev is not an ancestor of bad revChristian Couder2008-08-271-0/+90
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-09-161-11/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | t9700/test.pl: remove File::Temp requirementBrandon Casey2008-09-151-10/+13
View Lorry Controller Status