summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | technical-docs: document hash APIStephen Boyd2009-12-171-2/+48
* | | | | | | | | api-strbuf.txt: fix typos and document launch_editor()Stephen Boyd2009-12-171-2/+8
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Git 1.6.5.7v1.6.5.7Junio C Hamano2009-12-164-3/+23
* | | | | | | | worktree: don't segfault with an absolute pathspec without a work treeJunio C Hamano2009-12-162-2/+20
* | | | | | | | ignore unknown color configurationJeff King2009-12-164-3/+26
* | | | | | | | help.autocorrect: do not run a command if the command given is junkJohannes Sixt2009-12-151-2/+5
* | | | | | | | Illustrate "filter" attribute with an exampleNanako Shiraishi2009-12-141-0/+19
* | | | | | | | Git 1.6.5.6v1.6.5.6Junio C Hamano2009-12-104-3/+27
* | | | | | | | Fix archive format with -- on the command lineJunio C Hamano2009-12-101-6/+10
* | | | | | | | Remove post-upload-hookJunio C Hamano2009-12-104-172/+2
* | | | | | | | Merge branch 'mm/maint-merge-ff-error-message-fix' into maintJunio C Hamano2009-12-083-18/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-merge: show user-friendly error messages for fast-forward too.Matthieu Moy2009-11-291-0/+1
| * | | | | | | | merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-292-13/+21
* | | | | | | | | Merge branch 'jn/maint-pull-rebase-error-message' into maintJunio C Hamano2009-12-081-15/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pull: clarify advice for the unconfigured error caseJan Krüger2009-12-031-15/+33
* | | | | | | | | | Merge branch 'jk/maint-add-p-delete-fix' into maintJunio C Hamano2009-12-082-1/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add-interactive: fix deletion of non-empty filesJeff King2009-12-072-1/+25
* | | | | | | | | | | Git 1.6.5.5v1.6.5.5Junio C Hamano2009-12-054-5/+11
* | | | | | | | | | | Fix diff -B/--dirstat miscounting of newly added contentsLinus Torvalds2009-12-051-1/+10
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | reset: improve worktree safety valvesJeff King2009-12-052-5/+33
* | | | | | | | | | Documentation: Avoid use of xmlto --stringparamTodd Zullinger2009-12-053-11/+23
* | | | | | | | | | archive: clarify description of path parameterRené Scharfe2009-12-041-2/+3