summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* xdl_change_compact(): introduce the concept of a change groupMichael Haggerty2016-08-231-90/+203
* recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty2016-08-231-7/+7
* is_blank_line(): take a single xrecord_t as argumentMichael Haggerty2016-08-231-4/+4
* xdl_change_compact(): only use heuristic if group can't be matchedMichael Haggerty2016-08-231-19/+19
* xdl_change_compact(): fix compaction heuristic to adjust ixoMichael Haggerty2016-08-231-0/+1
* 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
| * | | | | | | http.c: implement the GIT_TRACE_CURL environment variableElia Pinto2016-05-243-2/+132
* | | | | | | | Second batch of topics for 2.10Junio C Hamano2016-06-271-0/+65
* | | | | | | | Sync with maintJunio C Hamano2016-06-271-0/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Start preparing for 2.9.1Junio C Hamano2016-06-272-1/+29
| * | | | | | | | Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-2710-93/+365
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/rev-list-count-with-bitmap' into maintJunio C Hamano2016-06-272-1/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'et/pretty-format-c-auto' into maintJunio C Hamano2016-06-272-8/+20
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/daemon-socket-keepalive' into maintJunio C Hamano2016-06-271-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tb/complete-status'Junio C Hamano2016-06-271-1/+97
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: add git statustb/complete-statusThomas Braun2016-06-101-0/+50
| * | | | | | | | | | | | completion: add __git_get_option_value helperThomas Braun2016-06-101-0/+44
| * | | | | | | | | | | | completion: factor out untracked file modes into a variableThomas Braun2016-06-101-1/+3
* | | | | | | | | | | | | Merge branch 'mg/cherry-pick-multi-on-unborn'Junio C Hamano2016-06-271-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | cherry-pick: allow to pick to unborn branchesmg/cherry-pick-multi-on-unbornMichael J Gruber2016-06-061-5/+6
* | | | | | | | | | | | | | Merge branch 'lf/receive-pack-auto-gc-to-client'Junio C Hamano2016-06-271-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | receive-pack: send auto-gc output over sideband 2lf/receive-pack-auto-gc-to-clientLukas Fleischer2016-06-061-2/+13
* | | | | | | | | | | | | | | Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'Junio C Hamano2016-06-273-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rebase: update comment about FreeBSD /bin/shem/newer-freebsd-shells-are-fine-with-returnsEd Maste2016-06-173-6/+6
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'lv/status-say-working-tree-not-directory'Junio C Hamano2016-06-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use "working tree" instead of "working directory" for git statuslv/status-say-working-tree-not-directoryLars Vogel2016-06-091-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'nb/gnome-keyring-build'Junio C Hamano2016-06-271-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | gnome-keyring: Don't hard-code pkg-config executablenb/gnome-keyring-buildHeiko Becker2016-06-141-2/+3
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/deref-tag'Junio C Hamano2016-06-272-6/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | blame, line-log: do not loop around deref_tag()jc/deref-tagJunio C Hamano2016-06-142-6/+3
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'et/add-chmod-x'Junio C Hamano2016-06-276-20/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add: add --chmod=+x / --chmod=-x optionsEdward Thomson2016-06-076-20/+68
View Lorry Controller Status