summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'jm/format-patch-mail-sig'Junio C Hamano2014-06-164-2/+93
|\ \ \ \ \ \ \
| * | | | | | | format-patch: add "--signature-file=<file>" optionjm/format-patch-mail-sigJeremiah Mahler2014-05-274-0/+86
| * | | | | | | format-patch: make newline after signature conditionalJeff King2014-05-211-2/+7
* | | | | | | | Merge branch 'jk/http-errors'Junio C Hamano2014-06-1612-13/+183
|\ \ \ \ \ \ \ \
| * | | | | | | | http: default text charset to iso-8859-1jk/http-errorsJeff King2014-05-271-0/+3
| * | | | | | | | remote-curl: reencode http error messagesJeff King2014-05-273-7/+19
| * | | | | | | | strbuf: add strbuf_reencode helperJeff King2014-05-273-0/+23
| * | | | | | | | http: optionally extract charset parameter from content-typeJeff King2014-05-272-4/+57
| * | | | | | | | http: extract type/subtype portion of content-typeJeff King2014-05-274-5/+48
| * | | | | | | | t5550: test display of remote http error messagesJeff King2014-05-234-0/+32
| * | | | | | | | t/lib-httpd: use write_script to copy CGI scriptsJeff King2014-05-232-2/+5
| * | | | | | | | test-lib: preserve GIT_CURL_VERBOSE from the environmentJeff King2014-05-231-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ow/config-mailmap-pathname'Junio C Hamano2014-06-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | config: respect '~' and '~user' in mailmap.fileow/config-mailmap-pathnameØystein Walle2014-05-271-1/+1
* | | | | | | | | Merge branch 'fc/remote-helper-refmap'Junio C Hamano2014-06-168-14/+141
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | transport-helper: remove unnecessary strbuf resetsfc/remote-helper-refmapFelipe Contreras2014-04-211-4/+0
| * | | | | | | | | transport-helper: add support to delete branchesFelipe Contreras2014-04-212-11/+21
| * | | | | | | | | fast-export: add support to delete refsFelipe Contreras2014-04-212-0/+25
| * | | | | | | | | fast-import: add support to delete refsFelipe Contreras2014-04-213-3/+31
| * | | | | | | | | transport-helper: add support to push symbolic refsFelipe Contreras2014-04-212-1/+18
| * | | | | | | | | transport-helper: add support for old:new refspecFelipe Contreras2014-04-212-4/+11
| * | | | | | | | | fast-export: add new --refspec optionFelipe Contreras2014-04-213-0/+43
| * | | | | | | | | fast-export: improve argument parsingFelipe Contreras2014-04-211-1/+2
* | | | | | | | | | Merge branch 'nd/daemonize-gc'Junio C Hamano2014-06-161-6/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | gc --auto: do not lock refs in the backgroundnd/daemonize-gcNguyễn Thái Ngọc Duy2014-05-271-6/+20
* | | | | | | | | | | Merge branch 'jm/t9138-style-fix'Junio C Hamano2014-06-161-18/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t9138-git-svn-authors-prog.sh fixupsjm/t9138-style-fixJeremiah Mahler2014-05-271-18/+17
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jm/instaweb-apache-24'Junio C Hamano2014-06-161-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-instaweb: add support for Apache 2.4jm/instaweb-apache-24Jonathan McCrohan2014-05-271-1/+11
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jl/remote-rm-prune'Junio C Hamano2014-06-163-9/+52
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remote prune: optimize "dangling symref" check/warningjl/remote-rm-pruneJens Lindström2014-05-273-2/+25
| * | | | | | | | | | | remote: repack packed-refs once when deleting multiple refsJens Lindström2014-05-273-3/+21
| * | | | | | | | | | | remote rm: delete remote configuration as the lastJens Lindström2014-05-231-4/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/complete-merge-pull'Junio C Hamano2014-06-161-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | completion: add missing options for git-mergejk/complete-merge-pullJohn Keeping2014-05-271-1/+4
| * | | | | | | | | | | completion: add a note that merge options are sharedJohn Keeping2014-05-271-0/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano2014-06-1612-21/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | transport-helper.c: rearrange xcalloc argumentsbg/xcalloc-nmemb-then-sizeBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | reflog-walk.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-4/+4
| * | | | | | | | | | | pack-revindex.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | notes.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-3/+3
| * | | | | | | | | | | imap-send.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | http-push.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | diff.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | config.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-2/+2
| * | | | | | | | | | | commit.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| * | | | | | | | | | | builtin/remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-4/+4
| * | | | | | | | | | | builtin/ls-remote.c: rearrange xcalloc argumentsBrian Gesiak2014-05-271-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano2014-06-165-8/+108
|\ \ \ \ \ \ \ \ \ \ \