summaryrefslogtreecommitdiffstats
path: root/builtin
AgeCommit message (Expand)AuthorLines
2017-01-31Merge branch 'jk/blame-fixes' into maintJunio C Hamano-10/+17
2017-01-31Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano-1/+17
2017-01-31Merge branch 'jc/compression-config' into maintJunio C Hamano-14/+0
2017-01-17Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano-3/+0
2017-01-17Merge branch 'jc/push-default-explicit' into maintJunio C Hamano-2/+5
2017-01-17Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano-4/+8
2017-01-17Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano-2/+2
2017-01-17Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano-4/+18
2017-01-17Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano-3/+1
2017-01-17Merge branch 'nd/worktree-list-fixup' into maintJunio C Hamano-7/+9
2017-01-17Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintJunio C Hamano-1/+6
2017-01-07blame: output porcelain "previous" header for each fileJeff King-9/+14
2017-01-07blame: handle --no-abbrevJeff King-0/+2
2017-01-07blame: fix alignment with --abbrev=40Jeff King-1/+1
2016-12-29repack: die on incremental + write-bitmap-indexDavid Turner-0/+9
2016-12-29auto gc: don't write bitmaps for incremental repacksDavid Turner-1/+8
2016-12-16index-pack: skip collision check when not in repositoryJeff King-4/+6
2016-12-16index-pack: complain when --stdin is used outside of a repoJeff King-0/+2
2016-12-09commit: remove 'Clever' message for --only --amendAndreas Krey-2/+0
2016-12-08am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer-1/+1
2016-12-08am: fix filename in safe_to_abort() error messageStephan Beyer-1/+1
2016-12-05commit: make --only --allow-empty work without pathsAndreas Krey-1/+1
2016-11-29pull: fast-forward "pull --rebase=true"Junio C Hamano-4/+18
2016-11-29Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano-3/+3
2016-11-29Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano-8/+6
2016-11-29Merge branch 'jc/am-read-author-file' into maintJunio C Hamano-58/+45
2016-11-28worktree list: keep the list sortedNguyễn Thái Ngọc Duy-1/+1
2016-11-28worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy-4/+4
2016-11-28get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy-2/+4
2016-11-28worktree: reorder an if statementNguyễn Thái Ngọc Duy-3/+3
2016-11-23Merge branch 'jc/setup-cleanup-fix'Junio C Hamano-8/+19
2016-11-23Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano-1/+3
2016-11-22archive: read local configurationJunio C Hamano-4/+4
2016-11-22mailinfo: read local configurationJunio C Hamano-4/+15
2016-11-21stripspace: respect repository configJohannes Schindelin-1/+3
2016-11-17Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano-3/+3
2016-11-16rev-parse: fix parent shorthands with --symbolicJeff King-1/+6
2016-11-15compression: unify pack.compression configuration parsingJunio C Hamano-14/+0
2016-11-11fetch: do not redundantly calculate tag refmapJonathan Tan-3/+0
2016-11-09create_branch: drop unused "head" parameterJeff King-3/+3
2016-10-31Merge branch 'rs/commit-pptr-simplify'Junio C Hamano-8/+6
2016-10-31Merge branch 'ls/filter-process'Junio C Hamano-8/+8
2016-10-31Merge branch 'ls/git-open-cloexec'Junio C Hamano-1/+1
2016-10-30commit: simplify building parents listRené Scharfe-8/+6
2016-10-28push: do not use potentially ambiguous default refspecJunio C Hamano-2/+5
2016-10-28Merge branch 'rs/cocci' into maintJunio C Hamano-5/+6
2016-10-28Merge branch 'js/reset-usage' into maintJunio C Hamano-1/+1
2016-10-28Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano-4/+7
2016-10-28Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano-0/+3
2016-10-28Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano-2/+5