summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update draft release notes to 1.7.0Junio C Hamano2010-01-291-2/+15
* Merge branch 'maint'Junio C Hamano2010-01-291-1/+1
|\
| * Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-291-1/+1
| |\
| | * fix memcpy of overlapping areaJeff King2010-01-291-1/+1
* | | Implement pthread_cond_broadcast on WindowsJohannes Sixt2010-01-292-15/+94
* | | If deriving SVN_SSH from GIT_SSH on msys, also add quotesSebastian Schuberth2010-01-291-0/+1
* | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2010-01-296-889/+3989
|\ \ \
| * | | gitk: Update German translationChristian Stimming2010-01-291-309/+432
| * | | gitk: Add French translationEmmanuel Trillaud2010-01-291-0/+1254
| * | | gitk: update Italian translationMichele Ballabio2010-01-291-265/+627
| * | | gitk: Update Swedish translationPeter Krefting2010-01-291-311/+362
| * | | gitk: Adjust two equal strings which differed in whitespaceMarkus Heidelberg2010-01-122-2/+2
| * | | gitk: Display submodule diffs with appropriate encodingKirill Smelkov2010-01-121-0/+2
| * | | gitk: Fix display of newly-created tagsDave Dulson2010-01-121-1/+1
| * | | gitk: Enable gitk to create tags with messagesDave Dulson2010-01-121-1/+11
| * | | gitk: Update Hungarian translationMiklos Vajna2010-01-121-312/+458
| * | | gitk: Add Hungarian translationLaszlo Papp2010-01-121-0/+1149
| * | | gitk: Add "--no-replace-objects" optionChristian Couder2009-12-141-1/+4
* | | | add shebang line to git-mergetool--lib.shJeff King2010-01-291-0/+1
* | | | fix off-by-one allocation errorJeff King2010-01-291-1/+1
* | | | Merge branch 'maint'Junio C Hamano2010-01-281-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | bash: don't offer remote transport helpers as subcommandsSZEDER Gábor2010-01-281-0/+1
* | | | bash: support 'git notes' and its subcommandsSZEDER Gábor2010-01-281-0/+19
* | | | grep --quiet: finishing touchesJunio C Hamano2010-01-283-2/+15
* | | | reject @{-1} not at beginning of object nameJeff King2010-01-282-1/+5
* | | | fix parsing of @{-1}@{u} combinationJeff King2010-01-282-4/+24
* | | | test combinations of @{} syntaxJeff King2010-01-281-0/+51
* | | | rerere: fix too-short initializationJeff King2010-01-281-1/+1
* | | | t0101: use absolute dateJeff King2010-01-281-1/+1
* | | | Merge branch 'fk/threaded-grep'Junio C Hamano2010-01-283-51/+482
|\ \ \ \
| * | | | Threaded grepFredrik Kuivinen2010-01-263-49/+468
| * | | | grep: expose "status-only" feature via -qJunio C Hamano2010-01-251-2/+14
* | | | | Merge branch 'gp/maint-cvsserver'Junio C Hamano2010-01-281-1/+1
|\ \ \ \ \
| * | | | | git-cvsserver: allow regex metacharacters in CVSROOTGerrit Pape2010-01-261-1/+1
| | |_|_|/ | |/| | |
* | | | | tests: update tests that used to failJunio C Hamano2010-01-282-2/+2
* | | | | Merge branch 'jc/upstream-reflog'Junio C Hamano2010-01-272-4/+43
|\ \ \ \ \
| * | | | | Fix log -g this@{upstream}Junio C Hamano2010-01-262-4/+43
* | | | | | Merge branch 'jc/maint-reflog-bad-timestamp'Junio C Hamano2010-01-274-10/+86
|\ \ \ \ \ \
| * | | | | | t0101: use a fixed timestamp when searching in the reflogJunio C Hamano2010-01-271-2/+2
| * | | | | | Update @{bogus.timestamp} fix not to die()Junio C Hamano2010-01-271-2/+2
| * | | | | | approxidate_careful() reports errorneous date stringJunio C Hamano2010-01-264-10/+86
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'il/maint-colon-address'Junio C Hamano2010-01-272-6/+38
|\ \ \ \ \ \
| * | | | | | Allow use of []-wrapped addresses in git://Ilari Liusvaara2010-01-261-2/+8
| * | | | | | Support addresses with ':' in git-daemonIlari Liusvaara2010-01-261-4/+30
| |/ / / / /
* | | | | | Merge branch 'il/maint-xmallocz'Junio C Hamano2010-01-274-10/+15
|\ \ \ \ \ \
| * | | | | | Fix integer overflow in unpack_compressed_entry()Ilari Liusvaara2010-01-261-2/+1
| * | | | | | Fix integer overflow in unpack_sha1_rest()Ilari Liusvaara2010-01-261-2/+1
| * | | | | | Fix integer overflow in patch_delta()Ilari Liusvaara2010-01-261-2/+1
| * | | | | | Add xmallocz()Ilari Liusvaara2010-01-262-4/+12
| |/ / / / /
* | | | | | Merge branch 'jh/maint-config-file-prefix'Junio C Hamano2010-01-272-1/+12
|\ \ \ \ \ \