summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | clean: remove redundant variable baselenNguyễn Thái Ngọc Duy2010-11-171-2/+2
| * | | | Merge branch 'mz/maint-rebase-X-fix' into maintJunio C Hamano2010-11-171-0/+21
| |\ \ \ \
| | * | | | t3402: test "rebase -s<strategy> -X<opt>"Junio C Hamano2010-11-111-0/+21
| * | | | | Documentation/git-pull: clarify configurationMartin von Zweigbergk2010-11-171-6/+8
| * | | | | Document that rev-list --graph triggers parent rewriting.Yann Dirson2010-11-171-0/+2
| * | | | | clean: avoid quoting twiceNguyễn Thái Ngọc Duy2010-11-161-2/+2
| * | | | | document sigchain apiJeff King2010-11-161-0/+41
| * | | | | Keep together options controlling the behaviour of diffcore-rename.Yann Dirson2010-11-161-14/+12
| |/ / / /
* | | | | Merge branch 'maint'Junio C Hamano2010-11-151-4/+0
|\ \ \ \ \ | |/ / / /
| * | | | rebase -X: do not clobber strategyMartin von Zweigbergk2010-11-101-4/+0
* | | | | tests: use test_cmp instead of piping to diff(1)Ævar Arnfjörð Bjarmason2010-11-142-47/+94
* | | | | t7004-tag.sh: re-arrange git tag comment for clarityÆvar Arnfjörð Bjarmason2010-11-141-5/+15
* | | | | Merge branch 'maint'Junio C Hamano2010-11-094-4/+16
|\ \ \ \ \ | |/ / / /
| * | | | Documentation: document show -sJonathan Nieder2010-11-092-0/+7
| * | | | dir.c: fix EXC_FLAG_MUSTBEDIR match in sparse checkoutNguyễn Thái Ngọc Duy2010-11-082-4/+9
| |/ / /
* | | | Merge branch 'aw/git-p4-deletion'Junio C Hamano2010-11-051-1/+3
|\ \ \ \
| * | | | Fix handling of git-p4 on deleted filesAndrew Waters2010-10-221-1/+3
* | | | | Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2010-11-053-23/+90
|\ \ \ \ \
| * | | | | git-gui: apply color information from git diff outputPat Thoyts2010-10-272-2/+42
| * | | | | git-gui: use wordprocessor tab style to ensure tabs work as expectedPat Thoyts2010-10-271-0/+1
| * | | | | git-gui: correct assignment of work-treePat Thoyts2010-10-201-5/+14
| * | | | | git-gui: use full dialog width for old name when renaming branchPat Thoyts2010-10-071-1/+1
| * | | | | git-gui: generic version trimmingPat Thoyts2010-10-071-5/+12
| * | | | | git-gui: enable the Tk console when tracing/debugging on WindowsPat Thoyts2010-10-051-0/+2
| * | | | | git-gui: show command-line errors in a messagebox on WindowsPat Thoyts2010-10-051-10/+16
| * | | | | On Windows, avoid git-gui to call Cygwin's nice utilitySebastian Schuberth2010-10-051-0/+2
* | | | | | Merge branch 'maint'Junio C Hamano2010-11-051-7/+7
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix a formatting error in git-merge.txtNathan W. Panike2010-10-291-7/+7
* | | | | | t0003: properly quote $HOMEThomas Rast2010-10-291-1/+1
* | | | | | contrib/ciabot: git-describe commit instead of HEADSven Eckelmann2010-10-291-1/+1
* | | | | | completion: fix zsh check under bash with 'set -u'Mark Lodato2010-10-281-3/+3
* | | | | | Merge branch 'ab/send-email-perl'Junio C Hamano2010-10-262-40/+36
|\ \ \ \ \ \