summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | commit -m: commit staged submodules regardless of ignore configjl/status-added-submodule-is-never-ignoredJens Lehmann2014-04-072-3/+17
| * | | | | | | | | | | status/commit: show staged submodules regardless of ignore configJens Lehmann2014-04-074-6/+92
* | | | | | | | | | | | Merge branch 'cb/byte-order'Junio C Hamano2014-06-161-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | compat/bswap.h: fix endianness detectioncb/byte-orderBen Walton2014-05-301-1/+1
| * | | | | | | | | | | | compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIANJunio C Hamano2014-05-021-7/+7
| * | | | | | | | | | | | compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDERCharles Bailey2014-05-021-9/+24
* | | | | | | | | | | | | Merge branch 'jk/strbuf-tolower'Junio C Hamano2014-06-164-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | strbuf: add strbuf_tolower functionjk/strbuf-tolowerJeff King2014-05-234-7/+13
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/daemon-tolower'Junio C Hamano2014-06-164-22/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | daemon/config: factor out duplicate xstrdup_tolowerjk/daemon-tolowerJeff King2014-05-234-22/+16
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'as/pretty-truncate'Junio C Hamano2014-06-165-72/+282
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | pretty.c: format string with truncate respects logOutputEncodingas/pretty-truncateAlexey Shumkin2014-05-213-8/+13