summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | 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
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jk/show-branch-strbuf'Junio C Hamano2013-04-151-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | show-branch: use strbuf instead of static bufferJeff King2013-04-061-9/+8
* | | | | | | | | | | | | | | | | Merge branch 'jk/http-error-messages'Junio C Hamano2013-04-154-23/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | http: drop http_error functionJeff King2013-04-063-11/+1
| * | | | | | | | | | | | | | | | remote-curl: die directly with http error messagesJeff King2013-04-061-2/+1
| * | | | | | | | | | | | | | | | http: re-word http error messageJeff King2013-04-061-1/+1
| * | | | | | | | | | | | | | | | http: simplify http_error helper functionJeff King2013-04-064-12/+8
| * | | | | | | | | | | | | | | | remote-curl: consistently report repo url for http errorsJeff King2013-04-061-2/+2
| * | | | | | | | | | | | | | | | remote-curl: always show friendlier 404 messageJeff King2013-04-061-4/+2
| * | | | | | | | | | | | | | | | remote-curl: let servers override http 404 adviceJeff King2013-04-061-1/+2
| * | | | | | | | | | | | | | | | remote-curl: show server content on http errorsJeff King2013-04-061-1/+32
| * | | | | | | | | | | | | | | | http: add HTTP_KEEP_ERROR optionJeff King2013-04-062-0/+38
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'tr/perl-keep-stderr-open'Junio C Hamano2013-04-152-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t9700: do not close STDERRThomas Rast2013-04-041-1/+2
| * | | | | | | | | | | | | | | | perl: redirect stderr to /dev/null instead of closingThomas Rast2013-04-041-3/+3
* | | | | | | | | | | | | | | | | Merge branch 'po/help-guides'Junio C Hamano2013-04-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status