summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | wt-status: collect untracked files in a separate "collect" phaseJunio C Hamano2009-08-102-23/+38
| * | | | | | | Make git_status_config() file scope static to builtin-commit.cJunio C Hamano2009-08-103-61/+60
| * | | | | | | wt-status: move wt_status_colors[] into wt_status structureJunio C Hamano2009-08-102-5/+8
| * | | | | | | wt-status: move many global settings to wt_status structureJunio C Hamano2009-08-103-84/+93
| * | | | | | | commit: --dry-runJunio C Hamano2009-08-072-14/+22
| * | | | | | | status: show worktree status of conflicted paths separatelyJunio C Hamano2009-08-063-3/+120
| * | | | | | | wt-status.c: rework the way changes to the index and work tree are summarizedJunio C Hamano2009-08-063-50/+199
| * | | | | | | diff-index: keep the original index intactJunio C Hamano2009-08-051-18/+0
| * | | | | | | diff-index: report unmerged new entriesJunio C Hamano2009-08-052-2/+33
* | | | | | | | Merge branch 'maint'Junio C Hamano2009-08-281-1/+6
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'rc/maint-http-fix' into maintJunio C Hamano2009-08-281-1/+3
| |\ \ \ \ \ \ \
| * | | | | | | | http.c: set slot callback members to NULL when releasing objectTay Ray Chuan2009-08-281-1/+6
* | | | | | | | | t/test-lib.sh: provide a shell implementation of the 'yes' utilityBrandon Casey2009-08-281-0/+15
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-08-274-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-1.6.3' into maintJunio C Hamano2009-08-274-4/+4
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2009-08-274-4/+4
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix overridable written with an extra 'e'Nanako Shiraishi2009-08-272-2/+2