summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2013-04-181-1/+2
|\
| * remote-hg: fix commit messagesFelipe Contreras2013-04-171-1/+2
* | Merge branch 'jk/test-trash'Junio C Hamano2013-04-181-9/+9
|\ \
| * | t/test-lib.sh: drop "$test" variableJeff King2013-04-141-5/+5
| * | t/test-lib.sh: fix TRASH_DIRECTORY handlingJohn Keeping2013-04-141-4/+4
* | | Merge branch 'th/t9903-symlinked-workdir'Junio C Hamano2013-04-181-5/+5
|\ \ \
| * | | t9903: Don't fail when run from path accessed through symlinkTorstein Hegge2013-04-111-5/+5
* | | | Merge branch 'jk/merge-tree-added-identically'Junio C Hamano2013-04-182-23/+13
|\ \ \ \
| * | | | merge-tree: don't print entries that match "local"John Keeping2013-04-082-23/+13
* | | | | Merge branch 'jk/http-dumb-namespaces'Junio C Hamano2013-04-183-4/+63
|\ \ \ \ \
| * | | | | http-backend: respect GIT_NAMESPACE with dumb clientsJohn Koleszar2013-04-093-4/+63
* | | | | | Merge branch 'rs/empty-archive'Junio C Hamano2013-04-181-1/+1
|\ \ \ \ \ \
| * | | | | | t5004: fix issue with empty archive test and bsdtarRené Scharfe2013-04-101-1/+1
* | | | | | | Merge branch 'fc/send-email-annotate'Junio C Hamano2013-04-187-90/+136
|\ \ \ \ \ \ \
| * | | | | | | rebase-am: explicitly disable cover-letterFelipe Contreras2013-04-141-2/+2
| * | | | | | | format-patch: trivial cleanupsFelipe Contreras2013-04-071-36/+35
| * | | | | | | format-patch: add format.coverLetter configuration variableFelipe Contreras2013-04-074-8/+62
| * | | | | | | log: update to OPT_BOOLFelipe Contreras2013-04-071-7/+7
| * | | | | | | format-patch: refactor branch name calculationFelipe Contreras2013-04-071-17/+16
| * | | | | | | format-patch: improve head calculation for cover-letterFelipe Contreras2013-04-072-18/+9
| * | | | | | | send-email: make annotate configurableFelipe Contreras2013-04-073-5/+8
* | | | | | | | Merge branch 'jc/push-2.0-default-to-simple' (early part)Junio C Hamano2013-04-1812-16/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | t5570: do not assume the "matching" push is the defaultBrian Gernhardt2013-04-031-0/+1
| * | | | | | | | t5551: do not assume the "matching" push is the defaultBrian Gernhardt2013-04-031-0/+1
| * | | | | | | | t5550: do not assume the "matching" push is the defaultBrian Gernhardt2013-04-031-0/+1
| * | | | | | | | t9401: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-0/+1
| * | | | | | | | t9400: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-0/+1
| * | | | | | | | t7406: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-2/+2
| * | | | | | | | t5531: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-0/+1
| * | | | | | | | t5519: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-6/+6
| * | | | | | | | t5517: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-1/+1
| * | | | | | | | t5516: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-5/+5
| * | | | | | | | t5505: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-1/+1
| * | | | | | | | t5404: do not assume the "matching" push is the defaultJunio C Hamano2013-01-041-1/+1
* | | | | | | | | Merge branch 'jk/daemon-user-doc'Junio C Hamano2013-04-181-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: clarify that "git daemon --user=<user>" option does not export HOME=~userJunio C Hamano2013-04-121-0/+7
* | | | | | | | | | Merge branch 'fc/completion'Junio C Hamano2013-04-182-47/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | completion: small optimizationFelipe Contreras2013-04-141-4/+4
| * | | | | | | | | | completion: inline __gitcomp_1 to its sole callsiteFelipe Contreras2013-04-141-15/+11
| * | | | | | | | | | completion: get rid of compgenFelipe Contreras2013-04-142-8/+13
| * | | | | | | | | | completion: add __gitcomp_nl testsFelipe Contreras2013-04-141-0/+60
| * | | | | | | | | | completion: add new __gitcompadd helperFelipe Contreras2013-04-141-5/+8
| * | | | | | | | | | completion: get rid of empty COMPREPLY assignmentsFelipe Contreras2013-04-121-21/+0
| * | | | | | | | | | completion: trivial test improvementFelipe Contreras2013-04-121-1/+2
| * | | | | | | | | | completion: add more cherry-pick optionsFelipe Contreras2013-04-121-1/+6
* | | | | | | | | | | Merge branch 'kb/co-orphan-suggestion-short-sha1'Junio C Hamano2013-04-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | checkout: abbreviate hash in suggest_reattachKevin Bracey2013-04-081-1/+1
* | | | | | | | | | | | Merge branch 'jc/detached-head-doc'Junio C Hamano2013-04-181-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | glossary: extend "detached HEAD" descriptionJunio C Hamano2013-04-051-3/+16
* | | | | | | | | | | | | Merge branch 'tr/packed-object-info-wo-recursion'Junio C Hamano2013-04-181-145/+266
|\ \ \ \ \ \ \ \ \ \ \ \ \