summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/submodule-init'Junio C Hamano2017-01-231-6/+7
|\
| * submodule update --init: display correct path from submodulesb/submodule-initStefan Beller2017-01-121-6/+7
* | Merge branch 'bw/pathspec-cleanup'Junio C Hamano2017-01-182-28/+38
|\ \
| * | ls-tree: convert show_recursive to use the pathspec struct interfaceBrandon Williams2017-01-081-9/+7
| * | mv: remove use of deprecated 'get_pathspec()'Brandon Williams2017-01-081-19/+31
* | | Merge branch 'jk/blame-fixes'Junio C Hamano2017-01-181-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'Junio C Hamano2017-01-182-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 'sb/submodule-rm-absorb'Junio C Hamano2017-01-181-62/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | rm: absorb a submodules git dir before deletionStefan Beller2016-12-271-61/+19
| * | | | | | | | | | | | | | | | | | | | | submodule: rename and add flags to ok_to_remove_submoduleStefan Beller2016-12-271-1/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-01-182-25/+367
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | grep: search history of moved submodulesBrandon Williams2016-12-221-2/+18
| * | | | | | | | | | | | | | | | | | | | | grep: enable recurse-submodules to work on <tree> objectsBrandon Williams2016-12-221-6/+70
| * | | | | | | | | | | | | | | | | | | | | grep: optionally recurse into submodulesBrandon Williams2016-12-221-19/+281
| * | | | | | | | | | | | | | | | | | | | | real_path: have callers use real_pathdup and strbuf_realpathBrandon Williams2016-12-121-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/submodule-embed-gitdir'Junio C Hamano2017-01-101-11/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | submodule: add absorb-git-dir functionStefan Beller2016-12-121-0/+38
| * | | | | | | | | | | | | | | | | | | | submodule helper: support super prefixStefan Beller2016-12-091-11/+20
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano2017-01-101-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | diff: retire "compaction" heuristicsjc/retire-compaction-heuristicsJunio C Hamano2016-12-231-3/+2
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/compression-config'Junio C Hamano2017-01-101-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'Junio C Hamano2017-01-101-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | fetch: do not redundantly calculate tag refmapjt/fetch-no-redundant-tag-fetch-mapJonathan Tan2016-11-111-3/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'lt/shortlog-by-committer'Junio C Hamano2016-12-271-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | shortlog: group by committer informationLinus Torvalds2016-12-151-3/+12
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-271-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | merge: mark usage error strings for translationcp/merge-continueJeff King2016-12-151-2/+2