Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/blame-fixes' into maint | Junio C Hamano | 2017-01-31 |
|\ | |||
| * | blame: output porcelain "previous" header for each file | Jeff King | 2017-01-07 |
| * | blame: handle --no-abbrev | Jeff King | 2017-01-07 |
| * | blame: fix alignment with --abbrev=40 | Jeff King | 2017-01-07 |
* | | Merge branch 'dt/disable-bitmap-in-auto-gc' into maint | Junio C Hamano | 2017-01-31 |
|\ \ | |||
| * | | repack: die on incremental + write-bitmap-index | David Turner | 2016-12-29 |
| * | | auto gc: don't write bitmaps for incremental repacks | David Turner | 2016-12-29 |
| |/ | |||
| * | Merge branch 'jk/create-branch-remove-unused-param' into maint | Junio C Hamano | 2016-11-29 |
| |\ | |||
| * \ | Merge branch 'rs/commit-pptr-simplify' into maint | Junio C Hamano | 2016-11-29 |
| |\ \ | |||
| * \ \ | Merge branch 'jc/am-read-author-file' into maint | Junio C Hamano | 2016-11-29 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-10-28 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'js/reset-usage' into maint | Junio C Hamano | 2016-10-28 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'jk/fetch-quick-tag-following' into maint | Junio C Hamano | 2016-10-28 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/merge-base-fork-point-without-reflog' into maint | Junio C Hamano | 2016-10-28 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'jk/clone-copy-alternates-fix' into maint | Junio C Hamano | 2016-10-28 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/worktree-config' into maint | Junio C Hamano | 2016-10-11 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jc/blame-abbrev' into maint | Junio C Hamano | 2016-10-11 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/copy-array' into maint | Junio C Hamano | 2016-10-11 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-tag-of-tag' into maint | Junio C Hamano | 2016-10-03 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/checkout-disambiguation' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reduce-gc-aggressive-depth' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/format-patch-base-info-above-sig' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/checkout-some-states-are-const' into maint | Junio C Hamano | 2016-09-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/compression-config' into maint | Junio C Hamano | 2017-01-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | compression: unify pack.compression configuration parsing | Junio C Hamano | 2016-11-15 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | fetch: do not redundantly calculate tag refmap | Jonathan Tan | 2016-11-11 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/push-default-explicit' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | push: do not use potentially ambiguous default refspec | Junio C Hamano | 2016-10-28 |
| |/ / / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | index-pack: skip collision check when not in repository | Jeff King | 2016-12-16 |
| * | | | | | | | | | | | | | | | | | | | | | index-pack: complain when --stdin is used outside of a repo | Jeff King | 2016-12-16 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/sequencer-abort-safety' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | am: change safe_to_abort()'s not rewinding error into a warning | Stephan Beyer | 2016-12-08 |
| * | | | | | | | | | | | | | | | | | | | | | | am: fix filename in safe_to_abort() error message | Stephan Beyer | 2016-12-08 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/pull-rebase-ff' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | pull: fast-forward "pull --rebase=true" | Junio C Hamano | 2016-11-29 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/commit-only-allow-empty' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | commit: remove 'Clever' message for --only --amend | Andreas Krey | 2016-12-09 |
| * | | | | | | | | | | | | | | | | | | | | | | | commit: make --only --allow-empty work without paths | Andreas Krey | 2016-12-05 |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-list-fixup' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | worktree list: keep the list sorted | Nguyễn Thái Ngọc Duy | 2016-11-28 |
| * | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: get_worktrees() takes a new flag argument | Nguyễn Thái Ngọc Duy | 2016-11-28 |
| * | | | | | | | | | | | | | | | | | | | | | | | | get_worktrees() must return main worktree as first item even on error | Nguyễn Thái Ngọc Duy | 2016-11-28 |
| * | | | | | | | | | | | | | | | | | | | | | | | | worktree: reorder an if statement | Nguyễn Thái Ngọc Duy | 2016-11-28 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/rev-parse-symbolic-parents-fix' into maint | Junio C Hamano | 2017-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | rev-parse: fix parent shorthands with --symbolic | Jeff King | 2016-11-16 |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/setup-cleanup-fix' | Junio C Hamano | 2016-11-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | | | | | | | archive: read local configuration | Junio C Hamano | 2016-11-22 |