summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | builtin-push: add --delete as syntactic sugar for :fooJan Krüger2009-12-303-3/+53
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mm/config-path'Junio C Hamano2010-01-103-4/+58
|\ \ \ \ \ \
| * | | | | | builtin-config: add --path option doing ~ and ~user expansion.Matthieu Moy2009-12-313-4/+58
| |/ / / / /
* | | | | | Merge branch 'pm/cvs-environ'Junio C Hamano2010-01-102-1/+36
|\ \ \ \ \ \
| * | | | | | CVS Server: Support reading base and roots from environmentPhil Miller2009-12-302-1/+36
| |/ / / / /
* | | | | | Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes'Junio C Hamano2010-01-101-4/+2
|\ \ \ \ \ \
| * | | | | | bash completion: factor submodules into dirty stateThomas Rast2009-12-311-4/+2
* | | | | | | Merge branch 'bg/maint-remote-update-default'Junio C Hamano2010-01-102-6/+18
|\ \ \ \ \ \ \
| * | | | | | | Fix "git remote update" with remotes.defalt setBjörn Gustavsson2009-12-312-6/+18
* | | | | | | | Merge branch 'mm/diag-path-in-treeish'Junio C Hamano2010-01-104-7/+198
|\ \ \ \ \ \ \ \
| * | | | | | | | Detailed diagnosis when parsing an object name fails.Matthieu Moy2009-12-074-7/+198
* | | | | | | | | Merge branch 'fc/opt-quiet-gc-reset'Junio C Hamano2010-01-103-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | General --quiet improvementsFelipe Contreras2009-12-033-3/+3
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-103-26/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | 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
* | | | | | | | | | | | | daemon: consider only address in kill_some_child()Erik Faye-Lund2010-01-091-8/+20
* | | | | | | | | | | | | help: fix configured help format taking over command line oneChristian Couder2010-01-091-1/+8
* | | | | | | | | | | | | string-list: rename the include guard to STRING_LIST_HThiago Farina2010-01-091-3/+3
* | | | | | | | | | | | | Describe second batch for 1.7.0 in draft release notesJunio C Hamano2010-01-071-1/+7
* | | | | | | | | | | | | Merge branch 'js/filter-branch-prime'Junio C Hamano2010-01-071-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | filter-branch: remove an unnecessary use of 'git read-tree'Johannes Sixt2009-12-151-1/+0
* | | | | | | | | | | | | | Merge branch 'sb/maint-octopus'Junio C Hamano2010-01-072-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 'mg/tag-d-show'Junio C Hamano2010-01-071-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | tag -d: print sha1 of deleted tagMichael J Gruber2009-12-101-1/+3
* | | | | | | | | | | | | | | Merge branch 'so/cvsserver-update'Junio C Hamano2010-01-071-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | cvsserver: make the output of 'update' more compatible with cvs.Sergei Organov2009-12-311-0/+16
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bg/maint-add-all-doc'Junio C Hamano2010-01-072-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 'mv/commit-date'Junio C Hamano2010-01-075-2/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Document date formats accepted by parse_date()Miklos Vajna2009-12-033-0/+29
| * | | | | | | | | | | | | | | | builtin-commit: add --date optionMiklos Vajna2009-12-033-2/+24
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mo/bin-wrappers'Junio C Hamano2010-01-076-32/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | INSTALL: document a simpler way to run uninstalled buildsMatthew Ogilvie2009-12-031-7/+11
| * | | | | | | | | | | | | | | | run test suite without dashed git-commands in PATHMatthew Ogilvie2009-12-032-12/+30
| * | | | | | | | | | | | | | | | build dashless "bin-wrappers" directory similar to installed bindirMatthew Ogilvie2009-12-033-13/+52
* | | | | | | | | | | | | | | | | .gitattributes: detect 8-space indent in shell scriptsJunio C Hamano2010-01-061-0/+1
* | | | | | | | | | | | | | | | | Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGSJonathan Nieder2010-01-051-1/+1