summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/column-use-utf8-strnwidth'Junio C Hamano2019-10-181-12/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | column: use utf8_strnwidth() to strip out ANSI color escapesRené Scharfe2019-10-151-12/+1
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/http-push-simplify'Junio C Hamano2019-10-181-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | http-push: simplify deleting a list itemRené Scharfe2019-10-151-4/+4
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jj/stash-reset-only-toplevel'Junio C Hamano2019-10-183-3/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | stash: avoid recursive hard reset on submodulesJakob Jarmar2019-10-153-3/+43
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/format-patch-o-create-leading-dirs'Junio C Hamano2019-10-184-2/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | format-patch: create leading components of output directoryBert Wesarg2019-10-124-2/+42
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bb/compat-util-comment-fix'Junio C Hamano2019-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | git-compat-util: fix documentation syntaxBeat Bolli2019-10-121-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bb/utf8-wcwidth-cleanup'Junio C Hamano2019-10-181-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | utf8: use ARRAY_SIZE() in git_wcwidth()Beat Bolli2019-10-121-4/+2
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dl/allow-running-cocci-verbosely'Junio C Hamano2019-10-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Makefile: respect $(V) in %.cocci.patch targetDenton Liu2019-10-121-1/+2
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dl/compat-cleanup'Junio C Hamano2019-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | pthread.h: manually align parameter listsDenton Liu2019-10-111-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ta/t1308-typofix'Junio C Hamano2019-10-181-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | t1308-config-set: fix a test that has a typoTanay Abhra2019-10-111-4/+4
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/doc-stash-save'Junio C Hamano2019-10-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | doc(stash): clarify the description of `save`Johannes Schindelin2019-10-111-2/+3
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Ninth batchJunio C Hamano2019-10-151-0/+33
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/coc'Junio C Hamano2019-10-151-0/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | CODE_OF_CONDUCT: mention individual project-leader emailsJeff King2019-10-101-0/+8
| * | | | | | | | | | | | | | | | | | | | | | | add a Code of Conduct documentJeff King2019-10-101-0/+85
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/trace2-fetch-push'Junio C Hamano2019-10-154-10/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | transport: push codepath can take arbitrary repositoryJunio C Hamano2019-10-081-10/+10
| * | | | | | | | | | | | | | | | | | | | | | | push: add trace2 instrumentationJosh Steadmon2019-10-032-2/+14
| * | | | | | | | | | | | | | | | | | | | | | | fetch: add trace2 instrumentationJosh Steadmon2019-10-032-8/+27
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/push-avoid-lazy-fetch'Junio C Hamano2019-10-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | send-pack: never fetch when checking exclusionsJonathan Tan2019-10-091-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dl/format-patch-doc-test-cleanup'Junio C Hamano2019-10-151-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t4014: treat rev-list output as the expected valueDenton Liu2019-10-091-2/+3
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/xdiffi-comment-updates'Junio C Hamano2019-10-151-44/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | xdiffi: fix typos and touch up commentsJohannes Schindelin2019-10-091-44/+55
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dl/t0000-skip-test-test'Junio C Hamano2019-10-151-0/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | t0000: cover GIT_SKIP_TESTS blindspotsDenton Liu2019-10-091-0/+38
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tg/range-diff-output-update'Junio C Hamano2019-10-153-22/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | range-diff: don't segfault with mode-only changesThomas Gummerer2019-10-093-22/+92
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gs/sq-quote-buf-pretty'Junio C Hamano2019-10-152-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | sq_quote_buf_pretty: don't drop empty argumentsGarima Singh2019-10-082-0/+13
| | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ew/hashmap'Junio C Hamano2019-10-1531-381/+667
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | hashmap_entry: remove first member requirement from docsEric Wong2019-10-079-10/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: remove type arg from hashmap_{get,put,remove}_entryEric Wong2019-10-0717-55/+56
| * | | | | | | | | | | | | | | | | | | | | | | | | | OFFSETOF_VAR macro to simplify hashmap iteratorsEric Wong2019-10-0715-45/+56
| * | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: introduce hashmap_free_entriesEric Wong2019-10-0717-34/+52
| * | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: hashmap_{put,remove} return hashmap_entry *Eric Wong2019-10-076-11/+32
| * | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: use *_entry APIs for iterationEric Wong2019-10-0713-47/+70
| * | | | | | | | | | | | | | | | | | | | | | | | | | hashmap_cmp_fn takes hashmap_entry paramsEric Wong2019-10-0723-115/+204
| * | | | | | | | | | | | | | | | | | | | | | | | | | hashmap_get{,_from_hash} return "struct hashmap_entry *"Eric Wong2019-10-0720-41/+72
| * | | | | | | | | | | | | | | | | | | | | | | | | | hashmap: use *_entry APIs to wrap container_ofEric Wong2019-10-076-40/+73