aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* prefix_filename: simplify windows #ifdefJeff King2017-03-21
* prefix_filename: return newly allocated stringJeff King2017-03-21
* prefix_filename: drop length parameterJeff King2017-03-21
* prefix_filename: move docstring to header fileJeff King2017-03-21
* hash-object: fix buffer reuse with --path in a subdirectoryJeff King2017-03-21
* Sync with 2.12.1Junio C Hamano2017-03-20
|\
| * Git 2.12.1v2.12.1Junio C Hamano2017-03-20
* | Merge branch 'js/difftool-builtin'Junio C Hamano2017-03-20
|\ \
| * | difftool: handle modified symlinks in dir-diff modeDavid Aguilar2017-03-15
| * | t7800: cleanup cruft left behind by testsDavid Aguilar2017-03-15
| * | t7800: remove whitespace before redirectDavid Aguilar2017-03-15
* | | Fifth batch for 2.13Junio C Hamano2017-03-17
* | | Merge branch 'jk/cherry-pick-0-mainline'Junio C Hamano2017-03-17
|\ \ \
| * | | cherry-pick: detect bogus arguments to --mainlineJeff King2017-03-15
* | | | Merge branch 'js/early-config'Junio C Hamano2017-03-17
|\ \ \ \
| * | | | setup.c: mention unresolved problemsJohannes Schindelin2017-03-14
| * | | | t1309: document cases where we would want early config not to die()Johannes Schindelin2017-03-14
| * | | | setup_git_directory_gently_1(): avoid die()ingJohannes Schindelin2017-03-14
| * | | | t1309: test read_early_config()Johannes Schindelin2017-03-14
| * | | | read_early_config(): really discover .git/Johannes Schindelin2017-03-14
| * | | | read_early_config(): avoid .git/config hack when unneededJohannes Schindelin2017-03-14
| * | | | setup: make read_early_config() reusableJohannes Schindelin2017-03-14
| * | | | setup: introduce the discover_git_directory() functionJohannes Schindelin2017-03-14
| * | | | setup_git_directory_1(): avoid changing global stateJohannes Schindelin2017-03-14
| * | | | setup: prepare setup_discovered_git_dir() for the root directoryJohannes Schindelin2017-03-14
| * | | | setup_git_directory(): use is_dir_sep() helperJohannes Schindelin2017-03-07
| * | | | t7006: replace dubious testJohannes Schindelin2017-03-03
* | | | | Merge branch 'bc/sha1-header-selection-with-cpp-macros'Junio C Hamano2017-03-17
|\ \ \ \ \
| * | | | | hash.h: move SHA-1 implementation selection into a header filebrian m. carlson2017-03-15
| |/ / / /
* | | | | Merge branch 'mg/status-porcelain-no-i18n'Junio C Hamano2017-03-17
|\ \ \ \ \
| * | | | | git-status: make porcelain more robustMichael J Gruber2017-03-14
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/add-i-use-pathspecs'Junio C Hamano2017-03-17
|\ \ \ \ \
| * | | | | add--interactive: do not expand pathspecs with ls-filesJeff King2017-03-14
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/http-walker-buffer-underflow-fix'Junio C Hamano2017-03-17
|\ \ \ \ \
| * | | | | http-walker: fix buffer underflow processing remote alternatesJeff King2017-03-13
| |/ / / /
* | | | | Merge branch 'bw/attr-pathspec'Junio C Hamano2017-03-17
|\ \ \ \ \
| * | | | | pathspec: allow escaped query valuesBrandon Williams2017-03-13
| * | | | | pathspec: allow querying for attributesBrandon Williams2017-03-13
* | | | | | Merge branch 'jk/ref-filter-flags-cleanup'Junio C Hamano2017-03-17
|\ \ \ \ \ \
| * | | | | | ref-filter: use separate cache for contains_tag_algoJeff King2017-03-10
| * | | | | | ref-filter: die on parse_commit errorsJeff King2017-03-10
| * | | | | | ref-filter: use contains_result enum consistentlyJeff King2017-03-10
| * | | | | | ref-filter: move ref_cbdata definition into ref-filter.cJeff King2017-03-10
* | | | | | | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-03-17
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: add --show-superproject-working-treeStefan Beller2017-03-08
| |/ / / / / /
* | | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-03-17
|\ \ \ \ \ \ \
| * | | | | | | wt-status: convert to struct object_idbrian m. carlson2017-02-22
| * | | | | | | builtin/merge-base: convert to struct object_idbrian m. carlson2017-02-22
| * | | | | | | Convert object iteration callbacks to struct object_idbrian m. carlson2017-02-22
| * | | | | | | sha1_file: introduce an nth_packed_object_oid functionbrian m. carlson2017-02-22