Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | prefix_filename: drop length parameter | Jeff King | 2017-03-21 | 15 | -35/+23 |
* | prefix_filename: move docstring to header file | Jeff King | 2017-03-21 | 2 | -5/+12 |
* | hash-object: fix buffer reuse with --path in a subdirectory | Jeff King | 2017-03-21 | 2 | -2/+15 |
* | Sync with 2.12.1 | Junio C Hamano | 2017-03-20 | 1 | -1/+2 |
|\ | |||||
| * | Git 2.12.1v2.12.1 | Junio C Hamano | 2017-03-20 | 1 | -1/+2 |
* | | Merge branch 'js/difftool-builtin' | Junio C Hamano | 2017-03-20 | 2 | -7/+111 |
|\ \ | |||||
| * | | difftool: handle modified symlinks in dir-diff mode | David Aguilar | 2017-03-15 | 2 | -5/+106 |
| * | | t7800: cleanup cruft left behind by tests | David Aguilar | 2017-03-15 | 1 | -1/+4 |
| * | | t7800: remove whitespace before redirect | David Aguilar | 2017-03-15 | 1 | -1/+1 |
* | | | Fifth batch for 2.13 | Junio C Hamano | 2017-03-17 | 1 | -9/+54 |
* | | | Merge branch 'jk/cherry-pick-0-mainline' | Junio C Hamano | 2017-03-17 | 2 | -1/+29 |
|\ \ \ | |||||
| * | | | cherry-pick: detect bogus arguments to --mainlinejk/cherry-pick-0-mainline | Jeff King | 2017-03-15 | 2 | -1/+29 |
* | | | | Merge branch 'js/early-config' | Junio C Hamano | 2017-03-17 | 7 | -111/+313 |
|\ \ \ \ | |||||
| * | | | | setup.c: mention unresolved problems | Johannes Schindelin | 2017-03-14 | 1 | -0/+2 |
| * | | | | t1309: document cases where we would want early config not to die() | Johannes Schindelin | 2017-03-14 | 1 | -0/+24 |
| * | | | | setup_git_directory_gently_1(): avoid die()ing | Johannes Schindelin | 2017-03-14 | 1 | -8/+17 |
| * | | | | t1309: test read_early_config() | Johannes Schindelin | 2017-03-14 | 2 | -0/+65 |
| * | | | | read_early_config(): really discover .git/ | Johannes Schindelin | 2017-03-14 | 2 | -23/+16 |
| * | | | | read_early_config(): avoid .git/config hack when unneeded | Johannes Schindelin | 2017-03-14 | 1 | -2/+3 |
| * | | | | setup: make read_early_config() reusable | Johannes Schindelin | 2017-03-14 | 3 | -31/+32 |
| * | | | | setup: introduce the discover_git_directory() function | Johannes Schindelin | 2017-03-14 | 2 | -0/+50 |
| * | | | | setup_git_directory_1(): avoid changing global state | Johannes Schindelin | 2017-03-14 | 1 | -75/+118 |
| * | | | | setup: prepare setup_discovered_git_dir() for the root directory | Johannes Schindelin | 2017-03-14 | 1 | -2/+4 |
| * | | | | setup_git_directory(): use is_dir_sep() helper | Johannes Schindelin | 2017-03-07 | 1 | -1/+3 |
| * | | | | t7006: replace dubious test | Johannes Schindelin | 2017-03-03 | 1 | -1/+11 |
* | | | | | Merge branch 'bc/sha1-header-selection-with-cpp-macros' | Junio C Hamano | 2017-03-17 | 3 | -8/+20 |
|\ \ \ \ \ | |||||
| * | | | | | hash.h: move SHA-1 implementation selection into a header filebc/sha1-header-selection-with-cpp-macros | brian m. carlson | 2017-03-15 | 3 | -8/+20 |
| |/ / / / | |||||
* | | | | | Merge branch 'mg/status-porcelain-no-i18n' | Junio C Hamano | 2017-03-17 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | git-status: make porcelain more robustmg/status-porcelain-no-i18n | Michael J Gruber | 2017-03-14 | 1 | -4/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/add-i-use-pathspecs' | Junio C Hamano | 2017-03-17 | 2 | -11/+45 |
|\ \ \ \ \ | |||||
| * | | | | | add--interactive: do not expand pathspecs with ls-filesjk/add-i-use-pathspecs | Jeff King | 2017-03-14 | 2 | -11/+45 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/http-walker-buffer-underflow-fix' | Junio C Hamano | 2017-03-17 | 1 | -4/+7 |
|\ \ \ \ \ | |||||
| * | | | | | http-walker: fix buffer underflow processing remote alternatesjk/http-walker-buffer-underflow-fix | Jeff King | 2017-03-13 | 1 | -4/+7 |
| |/ / / / | |||||
* | | | | | Merge branch 'bw/attr-pathspec' | Junio C Hamano | 2017-03-17 | 7 | -10/+446 |
|\ \ \ \ \ | |||||
| * | | | | | pathspec: allow escaped query values | Brandon Williams | 2017-03-13 | 2 | -4/+67 |
| * | | | | | pathspec: allow querying for attributes | Brandon Williams | 2017-03-13 | 7 | -9/+382 |
* | | | | | | Merge branch 'jk/ref-filter-flags-cleanup' | Junio C Hamano | 2017-03-17 | 2 | -31/+44 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ref-filter: use separate cache for contains_tag_algojk/ref-filter-flags-cleanup | Jeff King | 2017-03-10 | 1 | -20/+35 |
| * | | | | | | ref-filter: die on parse_commit errors | Jeff King | 2017-03-10 | 1 | -3/+1 |
| * | | | | | | ref-filter: use contains_result enum consistently | Jeff King | 2017-03-10 | 1 | -8/+8 |
| * | | | | | | ref-filter: move ref_cbdata definition into ref-filter.c | Jeff King | 2017-03-10 | 2 | -5/+5 |
* | | | | | | | Merge branch 'sb/rev-parse-show-superproject-root' | Junio C Hamano | 2017-03-17 | 5 | -0/+117 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse: add --show-superproject-working-tree | Stefan Beller | 2017-03-08 | 5 | -0/+117 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2017-03-17 | 33 | -462/+494 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | wt-status: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -22/+22 |
| * | | | | | | | builtin/merge-base: convert to struct object_id | brian m. carlson | 2017-02-22 | 1 | -14/+14 |
| * | | | | | | | Convert object iteration callbacks to struct object_id | brian m. carlson | 2017-02-22 | 9 | -50/+50 |
| * | | | | | | | sha1_file: introduce an nth_packed_object_oid function | brian m. carlson | 2017-02-22 | 2 | -3/+20 |
| * | | | | | | | refs: simplify parsing of reflog entries | brian m. carlson | 2017-02-22 | 1 | -5/+6 |
| * | | | | | | | refs: convert each_reflog_ent_fn to struct object_id | brian m. carlson | 2017-02-22 | 10 | -50/+50 |