summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/doc-http-backend'Junio C Hamano2013-04-213-1/+129
|\
| * doc/http-backend: match query-string in apache half-auth exampleJeff King2013-04-133-8/+72
| * doc/http-backend: give some lighttpd config examplesJeff King2013-04-111-0/+55
| * doc/http-backend: clarify "half-auth" repo configurationJeff King2013-04-111-0/+9
* | Merge branch 'jx/i18n-branch-error-messages'Junio C Hamano2013-04-211-27/+27
|\ \
| * | i18n: branch: mark strings for translationJiang Xin2013-04-151-27/+27
* | | Merge branch 'fc/remote-hg'Junio C Hamano2013-04-214-29/+148
|\ \ \
| * | | remote-hg: activate graphlog extension for hg_log()Antoine Pelisse2013-04-112-2/+7
| * | | remote-hg: fix bad file pathsFelipe Contreras2013-04-111-2/+8
| * | | remote-hg: document location of stored hg repositorySimon Ruderich2013-04-111-0/+3
| * | | remote-hg: fix bad state issueFelipe Contreras2013-04-111-1/+7
| * | | remote-hg: add 'insecure' optionSimon Ruderich2013-04-111-0/+9
| * | | remote-hg: add simple mail testFelipe Contreras2013-04-111-1/+2
| * | | remote-hg: add basic author testsFelipe Contreras2013-04-111-0/+35
| * | | remote-hg: show more proper errorsFelipe Contreras2013-04-111-3/+9
| * | | remote-hg: force remote pushFelipe Contreras2013-04-111-2/+9
| * | | remote-hg: push to the appropriate branchDusty Phillips2013-04-111-0/+4
| * | | remote-hg: update tags globallyFelipe Contreras2013-04-111-1/+5
| * | | remote-hg: update remote bookmarksFelipe Contreras2013-04-111-0/+5
| * | | remote-hg: refactor exportFelipe Contreras2013-04-111-8/+12
| * | | remote-hg: split bookmark handlingFelipe Contreras2013-04-111-14/+25
| * | | remote-hg: redirect buggy mercurial outputFelipe Contreras2013-04-111-0/+1
| * | | remote-hg: trivial test cleanupsFelipe Contreras2013-04-112-5/+3
| * | | remote-hg: make sure fake bookmarks are updatedFelipe Contreras2013-04-113-0/+9
| * | | remote-hg: fix for files with spacesPeter van Zetten2013-04-111-2/+2
| * | | remote-hg: properly report errors on bookmark pushesFelipe Contreras2013-04-111-0/+1
| * | | remote-hg: add missing config variable in docDusty Phillips2013-04-111-0/+4
| * | | remote-hg: trivial cleanupsFelipe Contreras2013-04-111-5/+5
* | | | Merge branch 'lf/read-blob-data-from-index'Junio C Hamano2013-04-214-59/+39
|\ \ \ \
| * | | | convert.c: remove duplicate codeLukas Fleischer2013-04-171-25/+2
| * | | | read_blob_data_from_index(): optionally return the size of blob dataLukas Fleischer2013-04-173-4/+6
| * | | | attr.c: extract read_index_data() as read_blob_data_from_index()Lukas Fleischer2013-04-173-34/+35
* | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-191-1/+27
* | | | | Merge branch 'jk/a-thread-only-dies-once'Junio C Hamano2013-04-193-6/+26
|\ \ \ \ \
| * | | | | run-command: use thread-aware die_is_recursing routineJeff King2013-04-161-0/+11
| * | | | | usage: allow pluggable die-recursion checksJeff King2013-04-162-6/+15
| |/ / / /
* | | | | Merge branch 'rt/commentchar-fmt-merge-msg'Junio C Hamano2013-04-191-3/+3
|\ \ \ \ \
| * | | | | t6200: avoid path mangling issue on WindowsJohannes Sixt2013-04-181-3/+3
* | | | | | Merge branch 'mv/sequencer-pick-error-diag'Junio C Hamano2013-04-192-0/+24
|\ \ \ \ \ \
| * | | | | | cherry-pick: make sure all input objects are commitsMiklos Vajna2013-04-112-0/+24
* | | | | | | Merge branch 'tr/copy-revisions-from-stdin'Junio C Hamano2013-04-191-1/+2
|\ \ \ \ \ \ \
| * | | | | | | read_revisions_from_stdin: make copies for handle_revision_argThomas Rast2013-04-161-1/+2
* | | | | | | | Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)Junio C Hamano2013-04-192-40/+95
|\ \ \ \ \ \ \ \
| * | | | | | | | add -A: only show pathless 'add -A' warning when changes exist outside cwdJonathan Nieder2013-04-031-5/+16
| * | | | | | | | add -u: only show pathless 'add -u' warning when changes exist outside cwdJonathan Nieder2013-04-032-4/+38
| * | | | | | | | add: make warn_pathless_add() a no-op after first callJonathan Nieder2013-04-031-0/+5
| * | | | | | | | add: add a blank line at the end of pathless 'add [-u|-A]' warningMatthieu Moy2013-04-031-1/+3
| * | | | | | | | add: make pathless 'add [-u|-A]' warning a file-global functionJonathan Nieder2013-03-201-33/+36
* | | | | | | | | Merge branch 'ap/strbuf-humanize'Junio C Hamano2013-04-196-40/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | count-objects: add -H option to humanize sizesAntoine Pelisse2013-04-102-12/+46