summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* parse-options.c: mark file-local function staticJunio C Hamano2010-01-122-5/+5
* entry.c: mark file-local function staticJunio C Hamano2010-01-122-4/+1
* http.c: mark file-local functions staticJunio C Hamano2010-01-122-11/+8
* pretty.c: mark file-local function staticJunio C Hamano2010-01-112-2/+1
* builtin-rev-list.c: mark file-local function staticJunio C Hamano2010-01-112-3/+1
* bisect.c: mark file-local function staticJunio C Hamano2010-01-111-1/+1
* push: spell 'Note about fast-forwards' section name correctly in error message.Matthieu Moy2010-01-111-2/+2
* Merge branch 'tr/http-updates'Junio C Hamano2010-01-103-2/+60
|\
| * Remove http.authAnyJunio C Hamano2009-12-292-23/+1
| * Allow curl to rewind the RPC read bufferMartin Storsjö2009-12-011-0/+30
| * Add an option for using any HTTP authentication scheme, not only basicMartin Storsjö2009-11-272-0/+29
| * http: maintain curl sessionsTay Ray Chuan2009-11-272-2/+23
* | Merge branch 'jk/maint-1.6.5-reset-hard'Junio C Hamano2010-01-102-4/+8
|\ \
| * | reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-302-4/+8
* | | Merge branch 'jk/push-to-delete'Junio C Hamano2010-01-103-3/+53
|\ \ \
| * | | 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