summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add url.<base>.pushInsteadOf: URL rewriting for push onlyJosh Triplett2009-09-085-10/+106
* Wrap rewrite globals in a struct in preparation for adding another setJosh Triplett2009-09-071-25/+28
* Merge branch 'maint'Junio C Hamano2009-09-061-3/+3
|\
| * push: re-flow non-fast-forward messageJeff King2009-09-061-3/+3
| * push: fix english in non-fast-forward messageJeff King2009-09-061-1/+1
* | Do not scramble password read from .cvspassPascal Obry2009-09-051-3/+3
* | Merge branch 'maint'Junio C Hamano2009-09-031-1/+1
|\ \ | |/
| * Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-09-034-24/+28
| |\
| | * Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-09-033-4/+8
| | |\
| | | * git-clone: add missing comma in --reference documentationMiklos Vajna2009-09-031-1/+1
* | | | Merge branch 'maint'Junio C Hamano2009-09-023-23/+27
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-09-023-23/+27
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-09-022-3/+7
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * clone: disconnect transport after fetchingJeff King2009-09-022-3/+7
| | * | git-cvsserver: no longer use deprecated 'git-subcommand' commandsGerrit Pape2009-09-021-20/+20
* | | | push: teach --quiet to suppress "Everything up-to-date"Jeff King2009-09-021-1/+1
* | | | status: list unmerged files much laterJohannes Sixt2009-09-011-1/+1
* | | | builtin-apply.c: get rid of an unnecessary use of temporary arrayJunio C Hamano2009-09-011-8/+6
* | | | builtin-pack-objects.c: avoid vlaJunio C Hamano2009-09-011-1/+3
* | | | Style fixes, add a space after if/for/while.Brian Gianforcaro2009-08-3113-30/+28
* | | | Merge branch 'lt/approxidate'Junio C Hamano2009-08-314-107/+316
|\ \ \ \
| * | | | fix approxidate parsing of relative months and yearsJeff King2009-08-302-3/+6
| * | | | tests: add date printing and parsing testsJeff King2009-08-301-0/+75
| * | | | refactor test-date interfaceJeff King2009-08-301-8/+55
| * | | | Add date formatting and parsing functions relative to a given timeAlex Riesen2009-08-302-63/+92
| * | | | Further 'approxidate' improvementsLinus Torvalds2009-08-221-5/+27
| * | | | Improve on 'approxidate'Linus Torvalds2009-08-221-30/+63
* | | | | Merge branch 'mr/gitweb-snapshot'Junio C Hamano2009-08-314-68/+154
|\ \ \ \ \
| * | | | | gitweb: add t9501 tests for checking HTTP status codesMark Rada2009-08-271-0/+78
| * | | | | gitweb: split test suite into library and testsMark Rada2009-08-272-66/+74
| * | | | | gitweb: improve snapshot error handlingMark Rada2009-08-251-2/+2
* | | | | | Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano2009-08-311-33/+53
|\ \ \ \ \ \
| * | | | | | xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano2009-08-231-31/+49
| * | | | | | xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano2009-08-231-2/+4
* | | | | | | Sync with 1.6.4.2Junio C Hamano2009-08-293-3/+34
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | GIT 1.6.4.2v1.6.4.2Junio C Hamano2009-08-294-3/+36
| * | | | | | Remove unused t/t8005/iso8859-5.txtNanako Shiraishi2009-08-291-2/+0
* | | | | | | UI consistency: allow --force for where -f means forceRené Scharfe2009-08-2910-5/+11
* | | | | | | update-server-info: make builtin, use parseoptRené Scharfe2009-08-295-29/+28
* | | | | | | Draft release notes to 1.6.5 before -rc0Junio C Hamano2009-08-281-1/+59
* | | | | | | Merge branch 'mm/reset-report'Junio C Hamano2009-08-285-15/+31
|\ \ \ \ \ \ \
| * | | | | | | reset: make the reminder output consistent with "checkout"Matthieu Moy2009-08-215-11/+27
| * | | | | | | Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.Matthieu Moy2009-08-214-5/+5
* | | | | | | | Merge branch 'jk/maint-1.6.3-checkout-unborn'Junio C Hamano2009-08-282-9/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: do not imply "-f" on unborn branchesJeff King2009-08-252-9/+43
* | | | | | | | | Merge branch 'np/maint-1.6.3-deepen'Junio C Hamano2009-08-282-1/+62
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix simple deepening of a repoNicolas Pitre2009-08-242-2/+61
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jc/shortstatus'Junio C Hamano2009-08-286-230/+550
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git commit --dry-run -v: show diff in color when askedJunio C Hamano2009-08-151-2/+4
| * | | | | | | | | Documentation/git-commit.txt: describe --dry-runJunio C Hamano2009-08-151-4/+9