Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/error-resolve-conflict-advice' | Junio C Hamano | 2014-06-16 |
|\ | |||
| * | error_resolve_conflict: drop quotations around operation | Jeff King | 2014-06-03 |
| * | error_resolve_conflict: rewrap advice message | Jeff King | 2014-06-03 |
* | | Merge branch 'rs/pack-objects-no-unnecessary-realloc' | Junio C Hamano | 2014-06-16 |
|\ \ | |||
| * | | pack-objects: use free()+xcalloc() instead of xrealloc()+memset() | René Scharfe | 2014-06-02 |
* | | | Merge branch 'lt/log-auto-decorate' | Junio C Hamano | 2014-06-16 |
|\ \ \ | |||
| * | | | git log: support "auto" decorations | Linus Torvalds | 2014-05-30 |
* | | | | Merge branch 'jm/doc-wording-tweaks' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ | |||
| * | | | | Documentation: wording fixes in the user manual and glossary | Jeremiah Mahler | 2014-05-28 |
* | | | | | Merge branch 'jm/format-patch-mail-sig' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ | |||
| * | | | | | format-patch: add "--signature-file=<file>" option | Jeremiah Mahler | 2014-05-27 |
| * | | | | | format-patch: make newline after signature conditional | Jeff King | 2014-05-21 |
* | | | | | | Merge branch 'jk/http-errors' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ | |||
| * | | | | | | http: default text charset to iso-8859-1 | Jeff King | 2014-05-27 |
| * | | | | | | remote-curl: reencode http error messages | Jeff King | 2014-05-27 |
| * | | | | | | strbuf: add strbuf_reencode helper | Jeff King | 2014-05-27 |
| * | | | | | | http: optionally extract charset parameter from content-type | Jeff King | 2014-05-27 |
| * | | | | | | http: extract type/subtype portion of content-type | Jeff King | 2014-05-27 |
| * | | | | | | t5550: test display of remote http error messages | Jeff King | 2014-05-23 |
| * | | | | | | t/lib-httpd: use write_script to copy CGI scripts | Jeff King | 2014-05-23 |
| * | | | | | | test-lib: preserve GIT_CURL_VERBOSE from the environment | Jeff King | 2014-05-23 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'ow/config-mailmap-pathname' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ | |||
| * | | | | | | config: respect '~' and '~user' in mailmap.file | Øystein Walle | 2014-05-27 |
* | | | | | | | Merge branch 'fc/remote-helper-refmap' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | transport-helper: remove unnecessary strbuf resets | Felipe Contreras | 2014-04-21 |
| * | | | | | | | transport-helper: add support to delete branches | Felipe Contreras | 2014-04-21 |
| * | | | | | | | fast-export: add support to delete refs | Felipe Contreras | 2014-04-21 |
| * | | | | | | | fast-import: add support to delete refs | Felipe Contreras | 2014-04-21 |
| * | | | | | | | transport-helper: add support to push symbolic refs | Felipe Contreras | 2014-04-21 |
| * | | | | | | | transport-helper: add support for old:new refspec | Felipe Contreras | 2014-04-21 |
| * | | | | | | | fast-export: add new --refspec option | Felipe Contreras | 2014-04-21 |
| * | | | | | | | fast-export: improve argument parsing | Felipe Contreras | 2014-04-21 |
* | | | | | | | | Merge branch 'nd/daemonize-gc' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | gc --auto: do not lock refs in the background | Nguyễn Thái Ngọc Duy | 2014-05-27 |
* | | | | | | | | | Merge branch 'jm/t9138-style-fix' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t9138-git-svn-authors-prog.sh fixups | Jeremiah Mahler | 2014-05-27 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jm/instaweb-apache-24' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | git-instaweb: add support for Apache 2.4 | Jonathan McCrohan | 2014-05-27 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'jl/remote-rm-prune' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | remote prune: optimize "dangling symref" check/warning | Jens Lindström | 2014-05-27 |
| * | | | | | | | | | remote: repack packed-refs once when deleting multiple refs | Jens Lindström | 2014-05-27 |
| * | | | | | | | | | remote rm: delete remote configuration as the last | Jens Lindström | 2014-05-23 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'jk/complete-merge-pull' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | completion: add missing options for git-merge | John Keeping | 2014-05-27 |
| * | | | | | | | | | completion: add a note that merge options are shared | John Keeping | 2014-05-27 |
| |/ / / / / / / / | |||
* | | | | | | | | | Merge branch 'bg/xcalloc-nmemb-then-size' | Junio C Hamano | 2014-06-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | transport-helper.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 |
| * | | | | | | | | | remote.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 |
| * | | | | | | | | | reflog-walk.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 |
| * | | | | | | | | | pack-revindex.c: rearrange xcalloc arguments | Brian Gesiak | 2014-05-27 |