summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* remote: ignore failure to remove missing branch.<name>.mergerl/remote-allow-missing-branch-name-mergeRoss Lagerwall2017-02-211-1/+3
* Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-311-10/+17
|\
| * blame: output porcelain "previous" header for each filejk/blame-fixesJeff King2017-01-071-9/+14
| * blame: handle --no-abbrevJeff King2017-01-071-0/+2
| * blame: fix alignment with --abbrev=40Jeff King2017-01-071-1/+1
* | Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano2017-01-312-1/+17
|\ \
| * | repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gcDavid Turner2016-12-291-0/+9
| * | auto gc: don't write bitmaps for incremental repacksDavid Turner2016-12-291-1/+8
| |/
| * Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-292-3/+3
| |\
| * \ Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-291-8/+6
| |\ \
| * \ \ Merge branch 'jc/am-read-author-file' into maintJunio C Hamano2016-11-291-58/+45
| |\ \ \
| * \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-283-5/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/reset-usage' into maintJunio C Hamano2016-10-281-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-281-4/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-281-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano2016-10-281-2/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/worktree-config' into maintJunio C Hamano2016-10-111-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/blame-abbrev' into maintJunio C Hamano2016-10-111-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/copy-array' into maintJunio C Hamano2016-10-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-031-1/+30
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-294-36/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/compression-config' into maintJunio C Hamano2017-01-311-14/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | compression: unify pack.compression configuration parsingjc/compression-configJunio C Hamano2016-11-151-14/+0
* | | | | | | | | | | | | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano2017-01-171-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fetch: do not redundantly calculate tag refmapjt/fetch-no-redundant-tag-fetch-mapJonathan Tan2016-11-111-3/+0
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-171-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | push: do not use potentially ambiguous default refspecJunio C Hamano2016-10-281-2/+5
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-171-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | index-pack: skip collision check when not in repositoryjk/index-pack-wo-repo-from-stdinJeff King2016-12-161-4/+6
| * | | | | | | | | | | | | | | | | | | | | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-161-0/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-081-1/+1
| * | | | | | | | | | | | | | | | | | | | | | am: fix filename in safe_to_abort() error messageStephan Beyer2016-12-081-1/+1
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-171-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-291-4/+18
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-171-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | commit: remove 'Clever' message for --only --amendak/commit-only-allow-emptyAndreas Krey2016-12-091-2/+0
| * | | | | | | | | | | | | | | | | | | | | | | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-051-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-list-fixup' into maintJunio C Hamano2017-01-172-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | worktree list: keep the list sortednd/worktree-list-fixupNguyễn Thái Ngọc Duy2016-11-281-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-282-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-281-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | worktree: reorder an if statementNguyễn Thái Ngọc Duy2016-11-281-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintJunio C Hamano2017-01-171-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | rev-parse: fix parent shorthands with --symbolicjk/rev-parse-symbolic-parents-fixJeff King2016-11-161-1/+6
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-233-8/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status