summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nd/graph-width-padded'Junio C Hamano2016-07-066-1/+80
|\
| * pretty.c: support <direction>|(<negative number>) formsnd/graph-width-paddedNguyễn Thái Ngọc Duy2016-06-162-1/+40
| * pretty: pass graph width to pretty formatting for use in '%>|(N)'Josef Kufner2016-06-166-0/+40
* | Merge branch 'jk/repack-keep-unreachable'Junio C Hamano2016-07-064-0/+82
|\ \
| * | repack: extend --keep-unreachable to loose objectsjk/repack-keep-unreachableJeff King2016-06-144-1/+47
| * | repack: add --keep-unreachable optionJeff King2016-06-143-0/+30
| * | repack: document --unpack-unreachable optionJeff King2016-06-141-0/+6
| |/
* | Merge branch 'ew/mboxrd-format-am'Junio C Hamano2016-07-0614-16/+191
|\ \
| * | am: support --patch-format=mboxrdew/mboxrd-format-amEric Wong2016-06-063-4/+33
| * | mailsplit: support unescaping mboxrd messagesEric Wong2016-06-066-1/+83
| * | pretty: support "mboxrd" output formatEric Wong2016-06-065-11/+75
* | | Merge branch 'jk/upload-pack-hook'Junio C Hamano2016-07-067-40/+259
|\ \ \
| * | | upload-pack: provide a hook for running pack-objectsJeff King2016-06-023-1/+89
| * | | t1308: do not get fooled by symbolic links to the source treeJunio C Hamano2016-06-021-1/+1
| * | | config: add a notion of "scope"Jeff King2016-05-274-0/+53
| * | | config: return configset value for current_config_ functionsJeff King2016-05-274-9/+87
| * | | config: set up config_source for command-line configJeff King2016-05-241-4/+19
| * | | git_config_parse_parameter: refactor cleanup codeJeff King2016-05-241-6/+7
| * | | git_config_with_options: drop "found" countingJeff King2016-05-241-25/+9
* | | | Merge branch 'nd/worktree-cleanup-post-head-protection'Junio C Hamano2016-07-064-19/+42
|\ \ \ \
| * | | | worktree: simplify prefixing pathsnd/worktree-cleanup-post-head-protectionNguyễn Thái Ngọc Duy2016-05-241-1/+3
| * | | | worktree: avoid 0{40}, too many zeroes, hard to readNguyễn Thái Ngọc Duy2016-05-241-1/+1
| * | | | worktree.c: use is_dot_or_dotdot()Nguyễn Thái Ngọc Duy2016-05-242-2/+2
| * | | | git-worktree.txt: keep subcommand listing in alphabetical orderNguyễn Thái Ngọc Duy2016-05-242-6/+6
| * | | | worktree.c: rewrite mark_current_worktree() to avoid strbufNguyễn Thái Ngọc Duy2016-05-241-9/+7
| * | | | completion: support git-worktreeNguyễn Thái Ngọc Duy2016-05-241-0/+23
* | | | | Merge branch 'jk/bisect-show-tree'Junio C Hamano2016-07-061-0/+1
|\ \ \ \ \
| * | | | | bisect: always call setup_revisions after init_revisionsjk/bisect-show-treeJeff King2016-06-161-0/+1
* | | | | | Merge branch 'lf/sideband-returns-void'Junio C Hamano2016-07-063-15/+10
|\ \ \ \ \ \
| * | | | | | upload-pack.c: make send_client_data() return voidlf/sideband-returns-voidLukas Fleischer2016-06-161-10/+5
| * | | | | | sideband.c: make send_sideband() return voidLukas Fleischer2016-06-163-6/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/add-i-diff-compact-heuristics'Junio C Hamano2016-07-061-0/+4
|\ \ \ \ \ \
| * | | | | | add--interactive: respect diff.compactionHeuristicjk/add-i-diff-compact-heuristicsJeff King2016-06-161-0/+4
* | | | | | | Merge branch 'km/fetch-do-not-free-remote-name'Junio C Hamano2016-07-061-4/+2
|\ \ \ \ \ \ \
| * | | | | | | builtin/fetch.c: don't free remote->name after fetchkm/fetch-do-not-free-remote-nameKeith McGuigan2016-06-141-4/+2
* | | | | | | | Merge branch 'nd/test-lib-httpd-show-error-log-in-verbose'Junio C Hamano2016-07-061-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | lib-httpd.sh: print error.log on errornd/test-lib-httpd-show-error-log-in-verboseNguyễn Thái Ngọc Duy2016-06-131-0/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/string-list-static-init'Junio C Hamano2016-07-0611-21/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | use string_list initializer consistentlyjk/string-list-static-initJeff King2016-06-138-13/+13
| * | | | | | | | Merge branch 'jk/parseopt-string-list' into jk/string-list-static-initJunio C Hamano2016-06-134-11/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | blame,shortlog: don't make local option variables staticJeff King2016-06-132-9/+9
| | * | | | | | | | interpret-trailers: don't duplicate option stringsJeff King2016-06-131-1/+1
| | * | | | | | | | parse_opt_string_list: stop allocating new stringsJeff King2016-06-131-1/+1
* | | | | | | | | | Merge branch 'jk/send-pack-stdio'Junio C Hamano2016-07-063-29/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | write_or_die: remove the unused write_or_whine() functionjk/send-pack-stdioRamsay Jones2016-06-102-12/+0
| * | | | | | | | | | send-pack: use buffered I/O to talk to pack-objectsJeff King2016-06-081-17/+16
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pb/commit-editmsg-path'Junio C Hamano2016-07-061-7/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/commit.c: memoize git-path for COMMIT_EDITMSGpb/commit-editmsg-pathPranit Bauva2016-06-091-7/+8
* | | | | | | | | | | Merge branch 'ep/http-curl-trace'Junio C Hamano2016-07-064-2/+133
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | imap-send.c: introduce the GIT_TRACE_CURL enviroment variableep/http-curl-traceElia Pinto2016-05-241-0/+1
View Lorry Controller Status