summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/cherry-pick-usability'Junio C Hamano2011-03-092-54/+125
|\
| * Teach commit about CHERRY_PICK_HEADJay Soffian2011-02-212-1/+30
| * Introduce CHERRY_PICK_HEADJay Soffian2011-02-211-1/+75
| * t3507: introduce pristine-detach helperJonathan Nieder2011-02-211-54/+22
* | Merge branch 'js/checkout-untracked-symlink'Junio C Hamano2011-03-092-3/+61
|\ \
| * | do not overwrite untracked symlinksClemens Buchacher2011-02-211-3/+11
| * | Demonstrate breakage: checkout overwrites untracked symlink with directoryJohannes Sixt2011-02-151-0/+50
| |/
* | Merge branch 'so/submodule-no-update-first-time'Junio C Hamano2011-03-091-0/+52
|\ \
| * | t7406: "git submodule update {--merge|--rebase]" with new submodulesSpencer E. Olson2011-02-171-0/+52
| |/
* | Merge branch 'maint'Junio C Hamano2011-03-091-1/+1
|\ \
| * | Fix typo in t/READMEMathias Lafeldt2011-03-091-1/+1
* | | Merge branch 'jn/maint-commit-missing-template'Junio C Hamano2011-03-041-3/+11
|\ \ \
| * | | commit: error out for missing commit message templateJonathan Nieder2011-02-251-3/+11
| * | | Merge branch 'maint-1.7.2' into maint-1.7.3Junio C Hamano2011-02-161-0/+1
| |\ \ \
| | * \ \ Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2011-02-161-0/+1
| | |\ \ \
| | | * \ \ Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2011-02-161-0/+1
| | | |\ \ \
* | | | \ \ \ Merge branch 'jk/diffstat-binary'Junio C Hamano2011-03-041-0/+7
|\ \ \ \ \ \ \
| * | | | | | | diff: handle diffstat of rewritten binary filesJeff King2011-02-221-0/+7
* | | | | | | | Merge branch 'lt/rename-no-extra-copy-detection'Junio C Hamano2011-03-045-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | diffcore-rename: properly honor the difference between -M and -CLinus Torvalds2011-02-185-6/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jn/test-terminal-punt-on-osx-breakage'Junio C Hamano2011-03-041-3/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | tests: skip terminal output tests on OS XJonathan Nieder2011-02-171-3/+19
* | | | | | | | | Merge branch 'jk/fail-null-clone'Junio C Hamano2011-03-041-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clone: die when trying to clone missing local pathJeff King2011-02-181-0/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano2011-02-284-65/+985
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'jn/svn-fe' of git://github.com/gitster/git into svn-feJonathan Nieder2011-02-261-3/+700
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | vcs-svn: Allow change nodes for root of tree (/)Jonathan Nieder2010-12-071-0/+55
| | * | | | | | | | | vcs-svn: Implement Prop-delta handlingDavid Barr2010-11-241-2/+100
| | * | | | | | | | | vcs-svn: More dump format sanity checksJonathan Nieder2010-11-241-0/+21
| | * | | | | | | | | vcs-svn: Reject path nodes without Node-actionJonathan Nieder2010-11-241-0/+20
| | * | | | | | | | | vcs-svn: Eliminate node_ctx.srcRev globalJonathan Nieder2010-11-241-0/+158
| | * | | | | | | | | vcs-svn: Allow simple v3 dumps (no deltas yet)David Barr2010-11-241-3/+347
| * | | | | | | | | | vcs-svn: allow input from file descriptorJonathan Nieder2011-02-261-0/+9
| * | | | | | | | | | vcs-svn: add binary-safe read functionJonathan Nieder2011-02-261-0/+18
| * | | | | | | | | | t0081 (line-buffer): add buffering testsJonathan Nieder2011-02-261-1/+109
| * | | | | | | | | | vcs-svn: tweak test-line-buffer to not assume line-oriented inputJonathan Nieder2011-02-261-14/+13
| * | | | | | | | | | tests: give vcs-svn/line_buffer its own test scriptJonathan Nieder2011-02-262-54/+67
| * | | | | | | | | | vcs-svn: make test-line-buffer input format more flexibleJonathan Nieder2011-02-261-9/+9
| * | | | | | | | | | fast-import: add 'ls' commandDavid Barr2011-02-261-8/+84
* | | | | | | | | | | Merge branch 'lp/config-vername-check'Junio C Hamano2011-02-271-4/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Disallow empty section and variable namesLibor Pechacek2011-02-221-0/+4
| * | | | | | | | | | | Sanity-check config variable namesLibor Pechacek2011-02-221-4/+14
* | | | | | | | | | | | Merge branch 'mg/placeholders-are-lowercase'Junio C Hamano2011-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make <identifier> lowercase as per CodingGuidelinesMichael J Gruber2011-02-151-1/+1
* | | | | | | | | | | | | Merge branch 'mg/patch-id'Junio C Hamano2011-02-271-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | git-patch-id: do not trip over "no newline" markersMichael J Gruber2011-02-171-1/+1
| * | | | | | | | | | | | | git-patch-id: test for "no newline" markersMichael J Gruber2011-02-171-0/+36
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mz/rerere-remaining'Junio C Hamano2011-02-271-6/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mergetool: don't skip modify/remove conflictsMartin von Zweigbergk2011-02-161-6/+34
* | | | | | | | | | | | | | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook'Junio C Hamano2011-02-271-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \