summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2011-01-081-0/+0
|\
| * Mark gitk script executableAnders Kaseorg2011-01-081-0/+0
* | t9157-*.sh: Add an svn version checkRamsay Jones2011-01-071-0/+8
* | git svn: fix the final example in man pageStephenB2011-01-071-1/+4
* | t3032: limit sed branch labels to 8 charactersBrandon Casey2011-01-061-3/+3
* | t0001,t1510,t3301: use sane_unset which always returns with status 0Brandon Casey2011-01-063-37/+37
* | trace.c: ensure NULL is not passed to printfBrandon Casey2011-01-061-1/+8
* | Git 1.7.4-rc1v1.7.4-rc1Junio C Hamano2011-01-053-3/+9
* | Merge branch 'maint' to sync with 1.7.3.5Junio C Hamano2011-01-051-0/+2
|\ \ | |/
| * Git 1.7.3.5v1.7.3.5Junio C Hamano2011-01-052-1/+3
* | Merge branch 'jn/svn-fe' (early part)Junio C Hamano2011-01-052-25/+47
|\ \
| * | vcs-svn: Error out for v3 dumpsJonathan Nieder2010-11-242-25/+47
* | | Merge branch 'ao/t9001-fix'Junio C Hamano2011-01-051-4/+4
|\ \ \
| * | | t/t9001-send-email.sh: fix '&&' chain in some testsAntonio Ospite2011-01-041-4/+4
* | | | Merge branch 'pw/convert-pathname-substitution'Junio C Hamano2011-01-053-1/+75
|\ \ \ \
| * | | | t0021: avoid getting filter killed with SIGPIPEJunio C Hamano2010-12-221-0/+1
| * | | | convert filter: supply path to external driverPete Wyckoff2010-12-223-1/+74
* | | | | Merge branch 'mg/cvsimport'Junio C Hamano2011-01-052-11/+31
|\ \ \ \ \
| * | | | | cvsimport: handle the parsing of uppercase config optionsMichael J Gruber2011-01-042-4/+24
| * | | | | cvsimport: partial whitespace cleanupMichael J Gruber2010-11-291-8/+8
* | | | | | Merge branch 'maint'Junio C Hamano2011-01-042-3/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | gitweb: skip logo in atom feed when there is noneJonathan Nieder2011-01-041-1/+1
| * | | | | t9001: Fix test prerequisitesRobin H. Johnson2010-12-291-2/+2
* | | | | | daemon: support <directory> arguments againJonathan Nieder2011-01-041-3/+4
* | | | | | Fix typos in the documentationRalf Wildenhues2011-01-0412-27/+26
* | | | | | Git 1.7.4-rc0v1.7.4-rc0Junio C Hamano2010-12-282-11/+10
* | | | | | Merge branch 'maint'Junio C Hamano2010-12-283-2/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Prepare for 1.7.3.5Junio C Hamano2010-12-282-1/+33
| * | | | | Merge branch 'jk/commit-die-on-bogus-ident' into maintJunio C Hamano2010-12-283-24/+40
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ks/blame-worktree-textconv-cached' into maintJunio C Hamano2010-12-282-2/+23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/maint-rebase-rewrite-last-skip' into maintJunio C Hamano2010-12-282-8/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-am-abort-safely' into maintJunio C Hamano2010-12-282-2/+34
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'kb/maint-status-cquote' into maintJunio C Hamano2010-12-281-0/+10
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix false positives in t3404 due to SHELL=/bin/falseRobin H. Johnson2010-12-281-1/+2
| * | | | | | | | | | Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano2010-12-261-1/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | close file on error in read_mmfile()René Scharfe2010-12-261-1/+3
* | | | | | | | | | | | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'Brandon Casey2010-12-281-1/+1
* | | | | | | | | | | | Merge branch 'jc/maint-rebase-rewrite-last-skip'Junio C Hamano2010-12-282-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | rebase --skip: correctly wrap-up when skipping the last patchJunio C Hamano2010-12-222-8/+17
* | | | | | | | | | | | Merge branch 'nd/setup'Junio C Hamano2010-12-2817-134/+4868
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwdNguyễn Thái Ngọc Duy2010-12-275-0/+38
| * | | | | | | | | | | | git.txt: correct where --work-tree path is relative toNguyễn Thái Ngọc Duy2010-12-221-1/+1
| * | | | | | | | | | | | Revert "Documentation: always respect core.worktree if set"Nguyễn Thái Ngọc Duy2010-12-221-15/+8
| * | | | | | | | | | | | t0001: test git init when run via an aliasJonathan Nieder2010-12-221-0/+56
| * | | | | | | | | | | | Remove all logic from get_git_work_tree()Nguyễn Thái Ngọc Duy2010-12-223-28/+19
| * | | | | | | | | | | | setup: rework setup_explicit_git_dir()Nguyễn Thái Ngọc Duy2010-12-222-203/+221
| * | | | | | | | | | | | setup: clean up setup_discovered_git_dir()Nguyễn Thái Ngọc Duy2010-12-222-48/+48
| * | | | | | | | | | | | t1020-subdirectory: test alias expansion in a subdirectoryMichael J Gruber2010-12-221-0/+8
| * | | | | | | | | | | | setup: clean up setup_bare_git_dir()Nguyễn Thái Ngọc Duy2010-12-221-10/+9
| * | | | | | | | | | | | setup: limit get_git_work_tree()'s to explicit setup case onlyNguyễn Thái Ngọc Duy2010-12-225-37/+51