summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ak/lazy-prereq-mktemp'Junio C Hamano2016-12-161-1/+2
|\
| * t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktempJeff King2016-11-291-1/+2
* | Merge branch 'nd/worktree-list-fixup'Junio C Hamano2016-12-166-30/+74
|\ \
| * | worktree list: keep the list sortednd/worktree-list-fixupNguyễn Thái Ngọc Duy2016-11-284-1/+36
| * | worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-285-8/+8
| * | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-283-9/+28
| * | worktree: reorder an if statementNguyễn Thái Ngọc Duy2016-11-281-3/+3
| * | worktree.c: zero new 'struct worktree' on allocationNguyễn Thái Ngọc Duy2016-11-231-12/+2
* | | Merge branch 'nd/qsort-in-merge-recursive'Junio C Hamano2016-12-161-9/+7
|\ \ \
| * | | merge-recursive.c: use string_list_sort instead of qsortnd/qsort-in-merge-recursiveNguyễn Thái Ngọc Duy2016-11-281-9/+7
* | | | Merge branch 'bw/push-dry-run'Junio C Hamano2016-12-164-9/+41
|\ \ \ \
| * | | | push: fix --dry-run to not push submodulesbw/push-dry-runBrandon Williams2016-11-234-10/+18
| * | | | push: --dry-run updates submodules when --recurse-submodules=on-demandBrandon Williams2016-11-231-0/+24
* | | | | Merge branch 'hv/submodule-not-yet-pushed-fix'Junio C Hamano2016-12-163-36/+121
|\ \ \ \ \ | |/ / / /
| * | | | submodule_needs_pushing(): explain the behaviour when we cannot answerhv/submodule-not-yet-pushed-fixHeiko Voigt2016-11-161-0/+11
| * | | | batch check whether submodule needs pushing into one callHeiko Voigt2016-11-161-29/+33
| * | | | serialize collection of refs that contain submodule changesHeiko Voigt2016-11-163-25/+44
| * | | | serialize collection of changed submodulesHeiko Voigt2016-11-161-4/+55
* | | | | Merge branch 'dt/empty-submodule-in-merge'Junio C Hamano2016-12-163-11/+17
|\ \ \ \ \
| * | | | | submodules: allow empty working-tree dirs in merge/cherry-pickdt/empty-submodule-in-mergeDavid Turner2016-11-173-11/+17
* | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix'Junio C Hamano2016-12-162-1/+24
|\ \ \ \ \ \
| * | | | | | rev-parse: fix parent shorthands with --symbolicjk/rev-parse-symbolic-parents-fixJeff King2016-11-162-1/+24
* | | | | | | Early fixes for 2.11.x seriesJunio C Hamano2016-12-131-0/+10
* | | | | | | Merge branch 'ew/svn-fixes'Junio C Hamano2016-12-132-2/+8
|\ \ \ \ \ \ \
| * | | | | | | git-svn: document useLogAuthor and addAuthorFrom config keysew/svn-fixesEric Wong2016-12-121-1/+7
| * | | | | | | git-svn: allow "0" in SVN path componentsEric Wong2016-12-121-1/+1
* | | | | | | | Merge branch 'js/mingw-isatty'Junio C Hamano2016-12-132-0/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: intercept isatty() to handle /dev/null as Git expects itJohannes Schindelin2016-12-112-0/+36
* | | | | | | | | Start post 2.11 cycleJunio C Hamano2016-12-053-2/+45
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Sync with maint-2.10Junio C Hamano2016-12-051-0/+48
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | preparing for 2.10.3Junio C Hamano2016-12-052-1/+49
| * | | | | | | Merge branch 'jk/common-main' into maint-2.10Junio C Hamano2016-12-055-11/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tk/diffcore-delta-remove-unused' into maintJunio C Hamano2016-11-295-8/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-294-13/+18
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/worktree-lock' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ps/common-info-doc' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-11-291-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-11-292-3/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maintJunio C Hamano2016-11-291-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-291-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-config-insn-fmt-docfix' into maintJunio C Hamano2016-11-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/pre-receive-hook-template-modefix' into maintJunio C Hamano2016-11-291-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/macos-update' into maintJunio C Hamano2016-11-292-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/merge-attr-sleep' into maintJunio C Hamano2016-11-291-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maintJunio C Hamano2016-11-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/daemon-path-ok-check-truncation' into maintJunio C Hamano2016-11-291-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/ring-buffer-wraparound' into maintJunio C Hamano2016-11-292-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/send-email-cc-cruft-after-address' into maintJunio C Hamano2016-11-293-10/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cp/completion-negative-refs' into maintJunio C Hamano2016-11-291-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/am-read-author-file' into maintJunio C Hamano2016-11-291-58/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
View Lorry Controller Status