aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'jk/blame-fixes' into maintJunio C Hamano2017-01-31
|\
| * blame: output porcelain "previous" header for each fileJeff King2017-01-07
| * blame: handle --no-abbrevJeff King2017-01-07
| * blame: fix alignment with --abbrev=40Jeff King2017-01-07
* | Merge branch 'dt/disable-bitmap-in-auto-gc' into maintJunio C Hamano2017-01-31
|\ \
| * | repack: die on incremental + write-bitmap-indexDavid Turner2016-12-29
| * | auto gc: don't write bitmaps for incremental repacksDavid Turner2016-12-29
| |/
| * Merge branch 'jk/create-branch-remove-unused-param' into maintJunio C Hamano2016-11-29
| |\
| * \ Merge branch 'rs/commit-pptr-simplify' into maintJunio C Hamano2016-11-29
| |\ \
| * \ \ Merge branch 'jc/am-read-author-file' into maintJunio C Hamano2016-11-29
| |\ \ \
| * \ \ \ Merge branch 'rs/cocci' into maintJunio C Hamano2016-10-28
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/reset-usage' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano2016-10-28
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/worktree-config' into maintJunio C Hamano2016-10-11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/blame-abbrev' into maintJunio C Hamano2016-10-11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/copy-array' into maintJunio C Hamano2016-10-11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/compression-config' into maintJunio C Hamano2017-01-31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | compression: unify pack.compression configuration parsingJunio C Hamano2016-11-15
* | | | | | | | | | | | | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fetch: do not redundantly calculate tag refmapJonathan Tan2016-11-11
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-default-explicit' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | push: do not use potentially ambiguous default refspecJunio C Hamano2016-10-28
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | index-pack: skip collision check when not in repositoryJeff King2016-12-16
| * | | | | | | | | | | | | | | | | | | | | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-16
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/sequencer-abort-safety' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | am: change safe_to_abort()'s not rewinding error into a warningStephan Beyer2016-12-08
| * | | | | | | | | | | | | | | | | | | | | | am: fix filename in safe_to_abort() error messageStephan Beyer2016-12-08
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | pull: fast-forward "pull --rebase=true"Junio C Hamano2016-11-29
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/commit-only-allow-empty' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | commit: remove 'Clever' message for --only --amendAndreas Krey2016-12-09
| * | | | | | | | | | | | | | | | | | | | | | | commit: make --only --allow-empty work without pathsAndreas Krey2016-12-05
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-list-fixup' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | worktree list: keep the list sortedNguyễn Thái Ngọc Duy2016-11-28
| * | | | | | | | | | | | | | | | | | | | | | | | worktree.c: get_worktrees() takes a new flag argumentNguyễn Thái Ngọc Duy2016-11-28
| * | | | | | | | | | | | | | | | | | | | | | | | get_worktrees() must return main worktree as first item even on errorNguyễn Thái Ngọc Duy2016-11-28
| * | | | | | | | | | | | | | | | | | | | | | | | worktree: reorder an if statementNguyễn Thái Ngọc Duy2016-11-28
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix' into maintJunio C Hamano2017-01-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | rev-parse: fix parent shorthands with --symbolicJeff King2016-11-16
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | archive: read local configurationJunio C Hamano2016-11-22