Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.22-rc0v2.22.0-rc0 | Junio C Hamano | 2019-05-13 | 2 | -1/+40 |
* | Merge branch 'jh/trace2' | Junio C Hamano | 2019-05-13 | 2 | -2/+2 |
|\ | |||||
| * | trace2: fix up a missing "leave" entry point | Ævar Arnfjörð Bjarmason | 2019-05-10 | 1 | -1/+1 |
| * | trace2: fix incorrect function pointer check | Josh Steadmon | 2019-04-26 | 1 | -1/+1 |
* | | Merge branch 'cc/access-on-aix-workaround' | Junio C Hamano | 2019-05-13 | 5 | -2/+52 |
|\ \ | |||||
| * | | git-compat-util: work around for access(X_OK) under root | Clément Chigot | 2019-04-25 | 5 | -2/+52 |
* | | | Merge branch 'pw/clean-sequencer-state-upon-final-commit' | Junio C Hamano | 2019-05-13 | 7 | -9/+201 |
|\ \ \ | |||||
| * | | | fix cherry-pick/revert status after commit | Phillip Wood | 2019-04-17 | 4 | -5/+107 |
| * | | | commit/reset: try to clean up sequencer state | Phillip Wood | 2019-04-17 | 5 | -4/+94 |
* | | | | Merge branch 'pw/rebase-i-internal' | Junio C Hamano | 2019-05-13 | 7 | -511/+532 |
|\ \ \ \ | |||||
| * | | | | rebase -i: run without forking rebase--interactive | Phillip Wood | 2019-04-19 | 1 | -135/+86 |
| * | | | | rebase: use a common action enum | Phillip Wood | 2019-04-19 | 1 | -43/+48 |
| * | | | | rebase -i: use struct rebase_options in do_interactive_rebase() | Phillip Wood | 2019-04-19 | 1 | -33/+36 |
| * | | | | rebase -i: use struct rebase_options to parse args | Phillip Wood | 2019-04-19 | 1 | -91/+112 |
| * | | | | rebase -i: use struct object_id for squash_onto | Phillip Wood | 2019-04-19 | 3 | -8/+33 |
| * | | | | rebase -i: use struct commit when parsing options | Phillip Wood | 2019-04-19 | 5 | -30/+55 |
| * | | | | rebase -i: remove duplication | Phillip Wood | 2019-04-19 | 1 | -3/+2 |
| * | | | | rebase -i: combine rebase--interactive.c with rebase.c | Phillip Wood | 2019-04-19 | 3 | -378/+367 |
| * | | | | rebase: use OPT_RERERE_AUTOUPDATE() | Phillip Wood | 2019-04-19 | 1 | -17/+13 |
| * | | | | rebase: rename write_basic_state() | Phillip Wood | 2019-04-19 | 1 | -2/+2 |
| * | | | | rebase: don't translate trace strings | Phillip Wood | 2019-04-19 | 1 | -8/+7 |
| * | | | | sequencer: always discard index after checkout | Phillip Wood | 2019-04-19 | 3 | -12/+20 |
| * | | | | Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal | Junio C Hamano | 2019-04-19 | 5 | -482/+553 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jk/perf-aggregate-wo-libjson' | Junio C Hamano | 2019-05-13 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t/perf: depend on perl JSON only when using --codespeed | Jeff King | 2019-04-24 | 1 | -2/+2 |
* | | | | | | | Merge branch 'dl/rev-tilde-doc-clarify' | Junio C Hamano | 2019-05-13 | 1 | -15/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | revisions.txt: remove ambibuity between <rev>:<path> and :<path> | Andreas Heiduk | 2019-05-08 | 1 | -5/+2 |
| * | | | | | | | revisions.txt: mention <rev>~ form | Denton Liu | 2019-05-08 | 1 | -1/+3 |
| * | | | | | | | revisions.txt: mark optional rev arguments with [] | Denton Liu | 2019-05-08 | 1 | -5/+5 |
| * | | | | | | | revisions.txt: change "rev" to "<rev>" | Denton Liu | 2019-05-08 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'jc/make-dedup-ls-files-output' | Junio C Hamano | 2019-05-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Makefile: dedup list of files obtained from ls-files | Junio C Hamano | 2019-04-22 | 1 | -2/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/ls-files-doc-markup-fix' | Junio C Hamano | 2019-05-13 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc/ls-files: put nested list for "-t" option into block | Jeff King | 2019-04-23 | 1 | -0/+2 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/p5302-avoid-collision-check-cost' | Junio C Hamano | 2019-05-13 | 1 | -13/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | p5302: create the repo in each index-pack test | Jeff King | 2019-04-23 | 1 | -13/+18 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'dl/no-extern-in-func-decl' | Junio C Hamano | 2019-05-13 | 70 | -1082/+1082 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | *.[ch]: manually align parameter lists | Denton Liu | 2019-05-05 | 44 | -202/+202 |
| * | | | | | | | | *.[ch]: remove extern from function declarations using sed | Denton Liu | 2019-05-05 | 11 | -49/+49 |
| * | | | | | | | | *.[ch]: remove extern from function declarations using spatch | Denton Liu | 2019-05-05 | 70 | -885/+885 |
* | | | | | | | | | Merge branch 'ew/repack-with-bitmaps-by-default' | Junio C Hamano | 2019-05-13 | 8 | -13/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pack-objects: default to writing bitmap hash-cache | Jeff King | 2019-03-18 | 5 | -9/+4 |
| * | | | | | | | | | t5310: correctly remove bitmaps for jgit test | Jeff King | 2019-03-18 | 1 | -1/+1 |
| * | | | | | | | | | repack: enable bitmaps by default on bare repos | Eric Wong | 2019-03-18 | 3 | -3/+23 |
* | | | | | | | | | | Merge branch 'js/partial-clone-connectivity-check' | Junio C Hamano | 2019-05-13 | 4 | -2/+55 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t/perf: add perf script for partial clones | Jeff King | 2019-05-05 | 1 | -0/+26 |
| * | | | | | | | | | | clone: do faster object check for partial clones | Josh Steadmon | 2019-04-21 | 3 | -2/+29 |
* | | | | | | | | | | | Merge branch 'jh/trace2-sid-fix' | Junio C Hamano | 2019-05-13 | 29 | -216/+758 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | trace2: fixup access problem on /etc/gitconfig in read_very_early_config | Jeff Hostetler | 2019-05-07 | 2 | -1/+5 |
| * | | | | | | | | | | | trace2: update docs to describe system/global config settings | Jeff Hostetler | 2019-04-16 | 4 | -67/+152 |