summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 1.6.6.1v1.6.6.1Junio C Hamano2010-01-203-8/+16
* Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-202-6/+18
|\
| * Fix "git remote update" with remotes.defalt setBjörn Gustavsson2009-12-312-6/+18
* | Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-202-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 maintJunio C Hamano2010-01-202-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
* | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-205-9/+40
|\ \ \ \
| * | | | 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5Junio C Hamano2010-01-201-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 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
* | | | | | | | | | | | bisect: fix singular/plural grammar nitDavid Ripton2010-01-191-3/+5
* | | | | | | | | | | | Update draft release notes to 1.6.6.1Junio C Hamano2010-01-181-1/+16
* | | | | | | | | | | | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maintJunio C Hamano2010-01-181-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 maintJunio C Hamano2010-01-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | grep: NUL terminate input from a fileJim Meyering2010-01-181-0/+1
* | | | | | | | | | | Fix uninitialized variable in get_refs_via_rsync().Richard Weinberger2010-01-151-1/+1
* | | | | | | | | | | Document git-blame triple -C optionRamkumar Ramachandra2010-01-142-3/+5
* | | | | | | | | | | remote-curl: Fix Accept header for smart HTTP connectionsShawn O. Pearce2010-01-122-2/+2
* | | | | | | | | | | grep: -L should show empty filesJunio C Hamano2010-01-121-2/+0
* | | | | | | | | | | rebase--interactive: Ignore comments and blank lines in peek_next_commandMichael Haggerty2010-01-111-1/+1
* | | | | | | | | | | Merge branch 'maint-1.6.2' into maintJunio C Hamano2010-01-102-13/+11
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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
* | | | | | | | | | | | | Documentation: tiny git config manual tweaksJonathan Nieder2010-01-091-4/+4
* | | | | | | | | | | | | Documentation: git gc packs refs by default nowJonathan Nieder2010-01-091-9/+6
* | | | | | | | | | | | | stash: mention --patch in usage string.Matthieu Moy2010-01-021-1/+1
* | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maintJunio C Hamano2009-12-312-15/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | branch: die explicitly why when calling "git branch [-a|-r] branchname".Matthieu Moy2009-12-312-15/+17
* | | | | | | | | | | | | fast-import: Document author/committer/tagger name is optionalShawn O. Pearce2009-12-312-6/+6
* | | | | | | | | | | | | SubmittingPatches: hints to know the status of a submitted patch.Matthieu Moy2009-12-311-0/+14
* | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-12-304-15/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |