Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/submodule-init' | Junio C Hamano | 2017-01-23 | 1 | -6/+7 |
|\ | |||||
| * | submodule update --init: display correct path from submodulesb/submodule-init | Stefan Beller | 2017-01-12 | 1 | -6/+7 |
* | | Merge branch 'bw/pathspec-cleanup' | Junio C Hamano | 2017-01-18 | 2 | -28/+38 |
|\ \ | |||||
| * | | ls-tree: convert show_recursive to use the pathspec struct interface | Brandon Williams | 2017-01-08 | 1 | -9/+7 |
| * | | mv: remove use of deprecated 'get_pathspec()' | Brandon Williams | 2017-01-08 | 1 | -19/+31 |
* | | | Merge branch 'jk/blame-fixes' | Junio C Hamano | 2017-01-18 | 1 | -10/+17 |
|\ \ \ | |||||
| * | | | blame: output porcelain "previous" header for each filejk/blame-fixes | Jeff King | 2017-01-07 | 1 | -9/+14 |
| * | | | blame: handle --no-abbrev | Jeff King | 2017-01-07 | 1 | -0/+2 |
| * | | | blame: fix alignment with --abbrev=40 | Jeff King | 2017-01-07 | 1 | -1/+1 |
* | | | | Merge branch 'dt/disable-bitmap-in-auto-gc' | Junio C Hamano | 2017-01-18 | 2 | -1/+17 |
|\ \ \ \ | |||||
| * | | | | repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gc | David Turner | 2016-12-29 | 1 | -0/+9 |
| * | | | | auto gc: don't write bitmaps for incremental repacks | David Turner | 2016-12-29 | 1 | -1/+8 |
| |/ / / | |||||
| * | | | Merge branch 'jk/create-branch-remove-unused-param' into maint | Junio C Hamano | 2016-11-29 | 2 | -3/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rs/commit-pptr-simplify' into maint | Junio C Hamano | 2016-11-29 | 1 | -8/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/am-read-author-file' into maint | Junio C Hamano | 2016-11-29 | 1 | -58/+45 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rs/cocci' into maint | Junio C Hamano | 2016-10-28 | 3 | -5/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'js/reset-usage' into maint | Junio C Hamano | 2016-10-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/fetch-quick-tag-following' into maint | Junio C Hamano | 2016-10-28 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/merge-base-fork-point-without-reflog' into maint | Junio C Hamano | 2016-10-28 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/clone-copy-alternates-fix' into maint | Junio C Hamano | 2016-10-28 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/worktree-config' into maint | Junio C Hamano | 2016-10-11 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/blame-abbrev' into maint | Junio C Hamano | 2016-10-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/copy-array' into maint | Junio C Hamano | 2016-10-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/pack-tag-of-tag' into maint | Junio C Hamano | 2016-10-03 | 1 | -1/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-09-29 | 4 | -36/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/checkout-disambiguation' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reduce-gc-aggressive-depth' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/format-patch-base-info-above-sig' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/checkout-some-states-are-const' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sb/submodule-rm-absorb' | Junio C Hamano | 2017-01-18 | 1 | -62/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | rm: absorb a submodules git dir before deletion | Stefan Beller | 2016-12-27 | 1 | -61/+19 |
| * | | | | | | | | | | | | | | | | | | | | | submodule: rename and add flags to ok_to_remove_submodule | Stefan Beller | 2016-12-27 | 1 | -1/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/grep-recurse-submodules' | Junio C Hamano | 2017-01-18 | 2 | -25/+367 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | grep: search history of moved submodules | Brandon Williams | 2016-12-22 | 1 | -2/+18 |
| * | | | | | | | | | | | | | | | | | | | | | grep: enable recurse-submodules to work on <tree> objects | Brandon Williams | 2016-12-22 | 1 | -6/+70 |
| * | | | | | | | | | | | | | | | | | | | | | grep: optionally recurse into submodules | Brandon Williams | 2016-12-22 | 1 | -19/+281 |
| * | | | | | | | | | | | | | | | | | | | | | real_path: have callers use real_pathdup and strbuf_realpath | Brandon Williams | 2016-12-12 | 1 | -3/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-embed-gitdir' | Junio C Hamano | 2017-01-10 | 1 | -11/+58 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | submodule: add absorb-git-dir function | Stefan Beller | 2016-12-12 | 1 | -0/+38 |
| * | | | | | | | | | | | | | | | | | | | | submodule helper: support super prefix | Stefan Beller | 2016-12-09 | 1 | -11/+20 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/retire-compaction-heuristics' | Junio C Hamano | 2017-01-10 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristics | Junio C Hamano | 2016-12-23 | 1 | -3/+2 |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/compression-config' | Junio C Hamano | 2017-01-10 | 1 | -14/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | compression: unify pack.compression configuration parsingjc/compression-config | Junio C Hamano | 2016-11-15 | 1 | -14/+0 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' | Junio C Hamano | 2017-01-10 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | fetch: do not redundantly calculate tag refmapjt/fetch-no-redundant-tag-fetch-map | Jonathan Tan | 2016-11-11 | 1 | -3/+0 |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/shortlog-by-committer' | Junio C Hamano | 2016-12-27 | 1 | -3/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | shortlog: group by committer information | Linus Torvalds | 2016-12-15 | 1 | -3/+12 |
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cp/merge-continue' | Junio C Hamano | 2016-12-27 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | merge: mark usage error strings for translationcp/merge-continue | Jeff King | 2016-12-15 | 1 | -2/+2 |