aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2016-10-27
|\
| * submodule: ignore trailing slash in relative urlStefan Beller2016-10-10
| * submodule: ignore trailing slash on superproject URLStefan Beller2016-10-10
* | Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano2016-10-27
|\ \
| * | find_unique_abbrev: use 4-buffer ringJeff King2016-10-26
* | | Merge branch 'jc/abbrev-auto'Junio C Hamano2016-10-27
|\ \ \
| * | | transport: allow summary-width to be computed dynamicallyJunio C Hamano2016-10-21
| * | | fetch: pass summary_width down the callchainJunio C Hamano2016-10-21
* | | | Merge branch 'lt/abbrev-auto'Junio C Hamano2016-10-27
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | abbrev: prepare for new world orderJunio C Hamano2016-10-03
| * | abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizingJunio C Hamano2016-10-03
* | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-10-26
|\ \ \
| * | | rev-list: use hdr_termination instead of a always using a newlineJacob Keller2016-10-20
* | | | Merge branch 'jk/fetch-quick-tag-following'Junio C Hamano2016-10-26
|\ \ \ \
| * | | | fetch: use "quick" has_sha1_file for tag followingJeff King2016-10-14
| * | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-09-08
| |\ \ \ \
| * \ \ \ \ Merge branch 'rs/use-strbuf-add-unique-abbrev' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/merge-add-strategies-simplification' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/no-html-bypass-on-windows' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sb/checkout-explit-detach-no-advice' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/mv-dir-to-new-directory' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/reflog-date' into maintJunio C Hamano2016-09-08
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge-base: handle --fork-point without reflogJeff King2016-10-12
* | | | | | | | | | | | | Merge branch 'bw/ls-files-recurse-submodules'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ls-files: add pathspec matching for submodulesBrandon Williams2016-10-10
| * | | | | | | | | | | | | ls-files: pass through safe options for --recurse-submodulesBrandon Williams2016-10-10
| * | | | | | | | | | | | | ls-files: optionally recurse into submodulesBrandon Williams2016-10-10
* | | | | | | | | | | | | | Merge branch 'js/libify-require-clean-work-tree'Junio C Hamano2016-10-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin2016-10-07
| * | | | | | | | | | | | | | wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin2016-10-07
| * | | | | | | | | | | | | | pull: make code more similar to the shell script againJohannes Schindelin2016-10-07
| * | | | | | | | | | | | | | pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin2016-10-07
* | | | | | | | | | | | | | | Merge branch 'js/reset-usage'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | reset: fix usageJohannes Schindelin2016-10-11
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | receive-pack: quarantine objects until pre-receive acceptsJeff King2016-10-10
* | | | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | alternates: use fspathcmp to detect duplicatesJeff King2016-10-10
| * | | | | | | | | | | | | | | count-objects: report alternates via verbose modeJeff King2016-10-10
| * | | | | | | | | | | | | | | alternates: use a separate scratch spaceJeff King2016-10-10
* | | | | | | | | | | | | | | | Merge branch 'jk/clone-copy-alternates-fix'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | clone: detect errors in normalize_path_copyJeff King2016-10-05
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/blame-reverse'Junio C Hamano2016-10-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."Junio C Hamano2016-06-14
| * | | | | | | | | | | | | | | | blame: improve diagnosis for "--reverse NEW"Junio C Hamano2016-06-14
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'nd/shallow-deepen'Junio C Hamano2016-10-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fetch, upload-pack: --deepen=N extends shallow boundary by N commitsNguyễn Thái Ngọc Duy2016-06-13
| * | | | | | | | | | | | | | | | clone: define shallow clone boundary with --shallow-excludeNguyễn Thái Ngọc Duy2016-06-13
| * | | | | | | | | | | | | | | | fetch: define shallow boundary with --shallow-excludeNguyễn Thái Ngọc Duy2016-06-13