summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | t6032: Add a test checking for excessive output from mergeElijah Newren2010-09-291-0/+30
| * | | | | t3030: Add a testcase for resolvable rename/add conflict with symlinksSchalk, Ken2010-09-291-1/+36
| * | | | | Merge branch 'en/rename-d-f' into en/merge-recursiveJunio C Hamano2010-09-291-0/+66
| |\ \ \ \ \
| | * | | | | merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren2010-09-091-2/+2
| | * | | | | t3509: Add rename + D/F conflict testcase that recursive strategy failsElijah Newren2010-09-091-0/+66
* | | | | | | Merge branch 'jn/cherry-pick-refresh-index'Junio C Hamano2010-11-291-0/+10
|\ \ \ \ \ \ \
| * | | | | | | cherry-pick/revert: transparently refresh indexJonathan Nieder2010-11-101-0/+10
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fc/apply-p2-get-header-name'Junio C Hamano2010-11-291-0/+26
|\ \ \ \ \ \ \
| * | | | | | | test: git-apply -p2 rename/chmod onlyJunio C Hamano2010-11-051-0/+26
| |/ / / / / /
* | | | | | | Merge branch 'jn/fast-import-fix'Junio C Hamano2010-11-291-0/+108
|\ \ \ \ \ \ \
| * | | | | | | t9300 (fast-import): another test for the "replace root" featureJonathan Nieder2010-10-191-1/+42
| * | | | | | | fast-import: tighten M 040000 syntaxJonathan Nieder2010-10-181-0/+30
| * | | | | | | fast-import: filemodify after M 040000 <tree> "" crashesJonathan Nieder2010-10-181-0/+37
* | | | | | | | Merge branch 'kb/blame-author-email'Junio C Hamano2010-11-292-6/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | blame: Add option to show author email instead of nameKevin Ballard2010-10-192-6/+11
* | | | | | | | | Merge branch 'cm/diff-check-at-eol'Junio C Hamano2010-11-291-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff --check: correct line numbers of new blank lines at EOFChristoph Mallon2010-10-161-0/+9
* | | | | | | | | | Merge branch 'ak/apply-non-git-epoch'Junio C Hamano2010-11-294-0/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | apply: handle patches with funny filename and colon in timezoneJonathan Nieder2010-11-103-0/+26
| * | | | | | | | | | apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg2010-10-131-0/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tc/smart-http-post-redirect'Junio C Hamano2010-11-292-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | smart-http: Don't change POST to GET when following redirectTay Ray Chuan2010-09-272-0/+15
* | | | | | | | | | | Merge branch 'en/and-cascade-tests'Junio C Hamano2010-11-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t7300: add a missing SYMLINKS prerequisiteJohannes Sixt2010-11-261-1/+1
* | | | | | | | | | | | Merge branch 'cb/maint-orphan-merge-noclobber'Junio C Hamano2010-11-241-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | do not overwrite untracked during merge from unborn branchClemens Buchacher2010-11-151-0/+16
* | | | | | | | | | | | | Merge branch 'ao/send-email-irt'Junio C Hamano2010-11-241-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-send-email.perl: make initial In-Reply-To apply only to first emailAntonio Ospite2010-11-121-1/+3
| * | | | | | | | | | | | | t9001: send-email interation with --in-reply-to and --chain-reply-toJunio C Hamano2010-11-051-0/+41
* | | | | | | | | | | | | | Merge branch 'kb/maint-rebase-autosquash'Junio C Hamano2010-11-241-0/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | rebase: teach --autosquash to match on sha1 in addition to messageKevin Ballard2010-11-091-0/+31
| * | | | | | | | | | | | | | rebase: better rearranging of fixup!/squash! lines with --autosquashKevin Ballard2010-11-091-0/+43
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mm/phrase-remote-tracking'Junio C Hamano2010-11-247-26/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Change incorrect "remote branch" to "remote tracking branch" in C codeMatthieu Moy2010-11-034-7/+9
| * | | | | | | | | | | | | | Change remote tracking to remote-tracking in non-trivial placesMatthieu Moy2010-11-031-1/+1
| * | | | | | | | | | | | | | Replace "remote tracking" with "remote-tracking"Matthieu Moy2010-11-031-1/+1
| * | | | | | | | | | | | | | Better "Changed but not updated" message in git-statusMatthieu Moy2010-11-031-17/+17
* | | | | | | | | | | | | | | Merge branch 'en/and-cascade-tests'Junio C Hamano2010-11-24114-657/+597
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | t4124 (apply --whitespace): use test_might_failJonathan Nieder2010-11-091-3/+2
| * | | | | | | | | | | | | | t3404: do not use 'describe' to implement test_cmp_revJunio C Hamano2010-11-091-2/+2
| * | | | | | | | | | | | | | t3404 (rebase -i): introduce helper to check position of HEADJonathan Nieder2010-11-091-15/+9
| * | | | | | | | | | | | | | t3404 (rebase -i): move comment to descriptionJonathan Nieder2010-11-091-18/+17
| * | | | | | | | | | | | | | t3404 (rebase -i): unroll test_commit loopsJonathan Nieder2010-11-091-12/+11
| * | | | | | | | | | | | | | t3301 (notes): use test_expect_code for clarityJonathan Nieder2010-11-091-1/+1
| * | | | | | | | | | | | | | t1400 (update-ref): use test_must_failJonathan Nieder2010-11-091-3/+2
| * | | | | | | | | | | | | | t1502 (rev-parse --parseopt): test exit code from "-h"Jonathan Nieder2010-11-091-1/+1
| * | | | | | | | | | | | | | t6022 (renaming merge): chain test commands with &&Jonathan Nieder2010-11-091-190/+92
| * | | | | | | | | | | | | | test-lib: introduce test_line_count to measure filesJonathan Nieder2010-11-092-0/+26
| * | | | | | | | | | | | | | tests: add missing &&, batch 2Jonathan Nieder2010-11-0913-48/+48
| * | | | | | | | | | | | | | tests: add missing &&Jonathan Nieder2010-11-0984-166/+166
View Lorry Controller Status