summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t5531: further "matching" fixupsjk/t5531-prepare-to-default-to-non-matchingJeff King2014-01-131-0/+1
* 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
|\ \ \ \ \ \
| * | | | | | sha1_file: remove recursion in unpack_entryThomas Rast2013-03-271-81/+150
| * | | | | | Refactor parts of in_delta_base_cache/cache_or_unpack_entryThomas Rast2013-03-271-13/+32
| * | | | | | sha1_file: remove recursion in packed_object_infoThomas Rast2013-03-251-51/+84
* | | | | | | Merge branch 'jk/http-error-messages'Junio C Hamano2013-04-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | http: set curl FAILONERROR each time we select a handleJeff King2013-04-161-1/+1
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-04-161-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | help.c: add a compatibility comment to cmd_version()David Aguilar2013-04-161-0/+4
* | | | | | | | | convert: The native line-ending is \r\n on MinGWJonathan Nieder2013-04-161-0/+1
* | | | | | | | | remote-bzr: fix prefix of tagsFelipe Contreras2013-04-151-3/+6
* | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-151-0/+25
* | | | | | | | | Merge branch 'jk/diff-graph-submodule-summary'Junio C Hamano2013-04-153-4/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule: print graph output next to submodule logJohn Keeping2013-04-053-4/+11
* | | | | | | | | | Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano2013-04-152-2/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: allow unstuck arguments with --diff-algorithmJohn Keeping2013-04-051-2/+3
| * | | | | | | | | | git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping2013-04-051-0/+6
* | | | | | | | | | | Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-152-7/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fmt-merge-msg: use core.commentchar in tag signatures completelyRalf Thielow2013-04-071-4/+8
| * | | | | | | | | | | fmt-merge-msg: respect core.commentchar in people creditsRalf Thielow2013-04-072-3/+21
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'lf/bundle-with-tip-wo-message'Junio C Hamano2013-04-152-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bundle: Accept prerequisites without commit messagesLukas Fleischer2013-04-072-1/+11
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |