summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* test-terminal: set output terminals to raw modetr/pty-allThomas Rast2011-12-191-0/+4
* Merge branch 'jk/push-progress'Junio C Hamano2010-11-178-51/+112
|\
| * push: pass --progress down to git-pack-objectsJeff King2010-10-184-2/+7
| * t5523-push-upstream: test progress messagesTay Ray Chuan2010-10-181-0/+38
| * t5523-push-upstream: add function to ensure fresh upstream repoTay Ray Chuan2010-10-181-1/+5
| * test_terminal: ensure redirections work reliablyJonathan Nieder2010-10-181-28/+10
| * test_terminal: catch use without TTY prerequisiteJonathan Nieder2010-10-182-8/+12
| * test-lib: allow test code to check the list of declared prerequisitesJonathan Nieder2010-10-181-7/+19
| * tests: test terminal output to both stdout and stderrJeff King2010-10-182-11/+28
| * tests: factor out terminal handling from t7006Jeff King2010-10-183-30/+29
* | Merge branch 'tr/maint-merge-file-subdir'Junio C Hamano2010-11-173-3/+16
|\ \
| * | merge-file: correctly find files when called in subdirThomas Rast2010-10-182-1/+14
| * | prefix_filename(): safely handle the case where pfx_len=0Thomas Rast2010-10-181-2/+2
* | | Merge branch 'jn/send-pack-error'Junio C Hamano2010-11-171-1/+1
|\ \ \
| * | | send-pack: avoid redundant "pack-objects died with strange error"Jonathan Nieder2010-10-181-1/+1
* | | | Merge branch 'mg/make-prove'Junio C Hamano2010-11-172-1/+15
|\ \ \ \
| * | | | test: allow running the tests under "prove"Michael J Gruber2010-10-262-1/+15
* | | | | Merge branch 'kb/completion-checkout'Junio C Hamano2010-11-171-3/+27
|\ \ \ \ \
| * | | | | completion: Support the DWIM mode for git checkoutKevin Ballard2010-10-131-3/+27
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sg/completion'Junio C Hamano2010-11-171-15/+64
|\ \ \ \ \
| * | | | | bash: support pretty format aliasesSZEDER Gábor2010-10-131-4/+17
| * | | | | bash: support more 'git notes' subcommands and their optionsSZEDER Gábor2010-10-131-9/+41
| * | | | | bash: not all 'git bisect' subcommands make sense when not bisectingSZEDER Gábor2010-10-131-1/+5
| * | | | | bash: offer refs for 'git bisect start'SZEDER Gábor2010-10-131-1/+1
| |/ / / /
* | | | | Merge branch 'sg/bisect'Junio C Hamano2010-11-171-2/+12
|\ \ \ \ \
| * | | | | bisect: check for mandatory argument of 'bisect replay'SZEDER Gábor2010-10-131-0/+1
| * | | | | bisect: improve error msg of 'bisect reset' when original HEAD is deletedSZEDER Gábor2010-10-131-1/+6
| * | | | | bisect: improve error message of 'bisect log' while not bisectingSZEDER Gábor2010-10-131-1/+5
| |/ / / /
* | | | | Merge branch 'ak/submodule-sync'Junio C Hamano2010-11-172-3/+14
|\ \ \ \ \
| * | | | | submodule sync: Update "submodule.<name>.url" for empty directoriesAndreas Köhler2010-10-132-3/+14
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/maint-rev-list-nul'Junio C Hamano2010-11-174-6/+16
|\ \ \ \ \
| * | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-134-6/+16
| |/ / / /
* | | | | Merge branch 'ks/no-textconv-symlink'Junio C Hamano2010-11-176-25/+114
|\ \ \ \ \
| * | | | | blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''Kirill Smelkov2010-09-296-21/+30
| * | | | | blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinksKirill Smelkov2010-09-292-0/+78
| * | | | | blame,cat-file: Prepare --textconv tests for correctly-failing conversion pro...Kirill Smelkov2010-09-292-12/+14
* | | | | | Merge branch 'jn/gitweb-test'Junio C Hamano2010-11-174-4/+35
|\ \ \ \ \ \
| * | | | | | gitweb/Makefile: Include gitweb/config.makJakub Narebski2010-09-301-0/+1
| * | | | | | gitweb/Makefile: Add 'test' and 'test-installed' targetsJakub Narebski2010-09-302-1/+14
| * | | | | | t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLEDJakub Narebski2010-09-301-2/+19
| * | | | | | gitweb: Move call to evaluate_git_version after evaluate_gitweb_configJakub Narebski2010-09-301-1/+1
* | | | | | | Merge branch 'cb/diff-fname-optim'Junio C Hamano2010-11-173-25/+124
|\ \ \ \ \ \ \
| * | | | | | | diff: avoid repeated scanning while looking for funcnameRené Scharfe2010-09-301-24/+14
| * | | | | | | do not search functions for patch IDClemens Buchacher2010-09-231-1/+1
| * | | | | | | add rebase patch id testsClemens Buchacher2010-09-231-0/+109
* | | | | | | | Merge branch 'jk/no-textconv-symlink'Junio C Hamano2010-11-172-3/+34
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | diff: don't use pathname-based diff drivers for symlinksJeff King2010-09-232-3/+34
| |/ / / / / /
* | | | | | | Merge branch 'dk/maint-blame-el'Junio C Hamano2010-11-171-0/+1
|\ \ \ \ \ \ \
| * | | | | | | git-blame.el: Add (require 'format-spec)David Kågedal2010-11-031-0/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-11-176-24/+88
|\ \ \ \ \ \ \ \