summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* builtin/describe: introduce --broken flagsb/describe-brokenStefan Beller2017-03-223-12/+66
* Sync with 2.12.1Junio C Hamano2017-03-201-1/+2
|\
| * Git 2.12.1v2.12.1Junio C Hamano2017-03-201-1/+2
* | Merge branch 'js/difftool-builtin'Junio C Hamano2017-03-202-7/+111
|\ \
| * | difftool: handle modified symlinks in dir-diff modeDavid Aguilar2017-03-152-5/+106
| * | t7800: cleanup cruft left behind by testsDavid Aguilar2017-03-151-1/+4
| * | t7800: remove whitespace before redirectDavid Aguilar2017-03-151-1/+1
* | | Fifth batch for 2.13Junio C Hamano2017-03-171-9/+54
* | | Merge branch 'jk/cherry-pick-0-mainline'Junio C Hamano2017-03-172-1/+29
|\ \ \
| * | | cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainlineJeff King2017-03-152-1/+29
* | | | Merge branch 'js/early-config'Junio C Hamano2017-03-177-111/+313
|\ \ \ \
| * | | | setup.c: mention unresolved problemsJohannes Schindelin2017-03-141-0/+2
| * | | | t1309: document cases where we would want early config not to die()Johannes Schindelin2017-03-141-0/+24
| * | | | setup_git_directory_gently_1(): avoid die()ingJohannes Schindelin2017-03-141-8/+17
| * | | | t1309: test read_early_config()Johannes Schindelin2017-03-142-0/+65
| * | | | read_early_config(): really discover .git/Johannes Schindelin2017-03-142-23/+16
| * | | | read_early_config(): avoid .git/config hack when unneededJohannes Schindelin2017-03-141-2/+3
| * | | | setup: make read_early_config() reusableJohannes Schindelin2017-03-143-31/+32
| * | | | setup: introduce the discover_git_directory() functionJohannes Schindelin2017-03-142-0/+50
| * | | | setup_git_directory_1(): avoid changing global stateJohannes Schindelin2017-03-141-75/+118
| * | | | setup: prepare setup_discovered_git_dir() for the root directoryJohannes Schindelin2017-03-141-2/+4
| * | | | setup_git_directory(): use is_dir_sep() helperJohannes Schindelin2017-03-071-1/+3
| * | | | t7006: replace dubious testJohannes Schindelin2017-03-031-1/+11
* | | | | Merge branch 'bc/sha1-header-selection-with-cpp-macros'Junio C Hamano2017-03-173-8/+20
|\ \ \ \ \
| * | | | | hash.h: move SHA-1 implementation selection into a header filebc/sha1-header-selection-with-cpp-macrosbrian m. carlson2017-03-153-8/+20
| |/ / / /
* | | | | Merge branch 'mg/status-porcelain-no-i18n'Junio C Hamano2017-03-171-4/+4
|\ \ \ \ \
| * | | | | git-status: make porcelain more robustmg/status-porcelain-no-i18nMichael J Gruber2017-03-141-4/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/add-i-use-pathspecs'Junio C Hamano2017-03-172-11/+45
|\ \ \ \ \
| * | | | | add--interactive: do not expand pathspecs with ls-filesjk/add-i-use-pathspecsJeff King2017-03-142-11/+45
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/http-walker-buffer-underflow-fix'Junio C Hamano2017-03-171-4/+7
|\ \ \ \ \
| * | | | | http-walker: fix buffer underflow processing remote alternatesjk/http-walker-buffer-underflow-fixJeff King2017-03-131-4/+7
| |/ / / /
* | | | | Merge branch 'bw/attr-pathspec'Junio C Hamano2017-03-177-10/+446
|\ \ \ \ \
| * | | | | pathspec: allow escaped query valuesBrandon Williams2017-03-132-4/+67
| * | | | | pathspec: allow querying for attributesBrandon Williams2017-03-137-9/+382
* | | | | | Merge branch 'jk/ref-filter-flags-cleanup'Junio C Hamano2017-03-172-31/+44
|\ \ \ \ \ \
| * | | | | | ref-filter: use separate cache for contains_tag_algojk/ref-filter-flags-cleanupJeff King2017-03-101-20/+35
| * | | | | | ref-filter: die on parse_commit errorsJeff King2017-03-101-3/+1
| * | | | | | ref-filter: use contains_result enum consistentlyJeff King2017-03-101-8/+8
| * | | | | | ref-filter: move ref_cbdata definition into ref-filter.cJeff King2017-03-102-5/+5
* | | | | | | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-03-175-0/+117
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: add --show-superproject-working-treeStefan Beller2017-03-085-0/+117
| |/ / / / / /
* | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-03-1733-462/+494
|\ \ \ \ \ \ \
| * | | | | | | wt-status: convert to struct object_idbrian m. carlson2017-02-221-22/+22
| * | | | | | | builtin/merge-base: convert to struct object_idbrian m. carlson2017-02-221-14/+14
| * | | | | | | Convert object iteration callbacks to struct object_idbrian m. carlson2017-02-229-50/+50
| * | | | | | | sha1_file: introduce an nth_packed_object_oid functionbrian m. carlson2017-02-222-3/+20
| * | | | | | | refs: simplify parsing of reflog entriesbrian m. carlson2017-02-221-5/+6
| * | | | | | | refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson2017-02-2210-50/+50
| * | | | | | | reflog-walk: convert struct reflog_info to struct object_idbrian m. carlson2017-02-221-6/+6
| * | | | | | | builtin/replace: convert to struct object_idbrian m. carlson2017-02-221-56/+56