summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | strbuf: create strbuf_humanise_bytes() to show byte sizesAntoine Pelisse2013-04-104-28/+40
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fc/branch-upstream-color'Junio C Hamano2013-04-192-9/+30
|\ \ \ \ \ \
| * | | | | | branch: colour upstream branchesFelipe Contreras2013-04-152-9/+30
* | | | | | | Merge branch 'mv/ssl-ftp-curl'Junio C Hamano2013-04-193-0/+27
|\ \ \ \ \ \ \
| * | | | | | | Support FTP-over-SSL/TLS for regular FTPModestas Vainius2013-04-123-0/+27
* | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-181-1/+25
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \