summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.6.5.9v1.6.5.9Junio C Hamano2010-12-155-18/+64
|\
| * Git 1.6.4.5v1.6.4.5Junio C Hamano2010-12-153-2/+22
| * gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski2010-12-151-15/+22
* | request-pull.txt: Document -p optionStephen Boyd2010-07-251-1/+4
* | Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-07-253-2/+22
|\ \ | |/
| * Check size of path buffer before writing into itGreg Brockman2010-07-251-0/+2
| * rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-optionUwe Kleine-König2010-07-072-2/+20
* | Remove extra '-' from git-am(1)Michal Sojka2010-03-041-1/+1
* | dwim_ref: fix dangling symref warningJeff King2010-02-161-2/+1
* | stash pop: remove 'apply' options during 'drop' invocationThomas Rast2010-02-152-2/+14
* | diff: make sure --output=/bad/path is caughtLarry D'Anna2010-02-151-0/+2
* | t8003: check exit code of command and error message separatelyJunio C Hamano2010-02-101-2/+4
* | blame: prevent a segv when -L given start > EOFJay Soffian2010-02-082-1/+9
* | Merge branch 'sb/maint-octopus' into maint-1.6.5Junio C Hamano2010-02-012-9/+57
|\ \
| * | octopus: remove dead codeStephen Boyd2009-12-131-5/+1
| * | octopus: reenable fast-forward mergesStephen Boyd2009-12-132-1/+19
| * | octopus: make merge process simpler to followStephen Boyd2009-12-132-4/+38
* | | Merge branch 'bg/maint-add-all-doc' into maint-1.6.5Junio C Hamano2010-02-012-29/+88
|\ \ \
| * | | git-rm doc: Describe how to sync index & work treeBjörn Gustavsson2010-01-071-1/+53
| * | | git-add/rm doc: Consistently back-quoteBjörn Gustavsson2009-12-072-15/+15
| * | | Documentation: 'git add -A' can remove filesBjörn Gustavsson2009-12-071-13/+20
* | | | fix memcpy of overlapping areaJeff King2010-01-291-1/+1
* | | | Git 1.6.5.8v1.6.5.8Junio C Hamano2010-01-204-3/+32
* | | | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2010-01-202-4/+8
|\ \ \ \
| * | | | reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-302-4/+8
* | | | | Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1...Junio C Hamano2010-01-201-4/+2
|\ \ \ \ \
| * | | | | bash completion: factor submodules into dirty stateThomas Rast2009-12-311-4/+2
* | | | | | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5Junio C Hamano2010-01-201-5/+5
|\ \ \ \ \ \
| * | | | | | fast-import: tag may point to any object typeDmitry Potapov2010-01-141-5/+5
| |/ / / / /
* | | | | | Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5Junio C Hamano2010-01-201-0/+1
|\ \ \ \ \ \
| * | | | | | grep: NUL terminate input from a fileJim Meyering2010-01-181-0/+1
* | | | | | | Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-188-43/+47
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-188-43/+47
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-188-43/+47
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-108-43/+47
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2010-01-104-28/+28
| | | | |\ \ \ \ \
| | | | | * | | | | base85: Make the code more obvious instead of explaining the non-obviousAndreas Gruenbacher2010-01-091-8/+2
| | | | | * | | | | base85: encode_85() does not use the decode tableAndreas Gruenbacher2010-01-091-2/+0
| | | | | * | | | | base85 debug code: Fix length byte calculationAndreas Gruenbacher2010-01-091-1/+1
| | | | | * | | | | checkout -m: do not try to fall back to --merge from an unborn branchJunio C Hamano2010-01-061-2/+8
| | | | | * | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-312-15/+17
| | | | * | | | | | textconv: stop leaking file descriptorsJeff King2009-12-301-0/+2
| | | | * | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-12-292-9/+11
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | commit: --cleanup is a message optionGreg Price2009-12-291-2/+4
| | | | | * | | | | t7102: make the test fail if one of its check failsNguyễn Thái Ngọc Duy2009-12-291-7/+7
| | | | * | | | | | git count-objects: handle packs bigger than 4GAndreas Schwab2009-12-291-6/+6
| * | | | | | | | | Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-181-1/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-181-1/+5
* | | | | | | | | | | Prevent git blame from segfaulting on a missing author nameDavid Reiss2009-12-222-3/+23
* | | | | | | | | | | rebase -i: abort cleanly if the editor fails to launchBjörn Gustavsson2009-12-191-1/+1