summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.22-rc0v2.22.0-rc0Junio C Hamano2019-05-132-1/+40
* Merge branch 'jh/trace2'Junio C Hamano2019-05-132-2/+2
|\
| * trace2: fix up a missing "leave" entry pointÆvar Arnfjörð Bjarmason2019-05-101-1/+1
| * trace2: fix incorrect function pointer checkJosh Steadmon2019-04-261-1/+1
* | Merge branch 'cc/access-on-aix-workaround'Junio C Hamano2019-05-135-2/+52
|\ \
| * | git-compat-util: work around for access(X_OK) under rootClément Chigot2019-04-255-2/+52
* | | Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano2019-05-137-9/+201
|\ \ \
| * | | fix cherry-pick/revert status after commitPhillip Wood2019-04-174-5/+107
| * | | commit/reset: try to clean up sequencer statePhillip Wood2019-04-175-4/+94
* | | | Merge branch 'pw/rebase-i-internal'Junio C Hamano2019-05-137-511/+532
|\ \ \ \
| * | | | rebase -i: run without forking rebase--interactivePhillip Wood2019-04-191-135/+86
| * | | | rebase: use a common action enumPhillip Wood2019-04-191-43/+48
| * | | | rebase -i: use struct rebase_options in do_interactive_rebase()Phillip Wood2019-04-191-33/+36
| * | | | rebase -i: use struct rebase_options to parse argsPhillip Wood2019-04-191-91/+112
| * | | | rebase -i: use struct object_id for squash_ontoPhillip Wood2019-04-193-8/+33
| * | | | rebase -i: use struct commit when parsing optionsPhillip Wood2019-04-195-30/+55
| * | | | rebase -i: remove duplicationPhillip Wood2019-04-191-3/+2
| * | | | rebase -i: combine rebase--interactive.c with rebase.cPhillip Wood2019-04-193-378/+367
| * | | | rebase: use OPT_RERERE_AUTOUPDATE()Phillip Wood2019-04-191-17/+13
| * | | | rebase: rename write_basic_state()Phillip Wood2019-04-191-2/+2
| * | | | rebase: don't translate trace stringsPhillip Wood2019-04-191-8/+7
| * | | | sequencer: always discard index after checkoutPhillip Wood2019-04-193-12/+20
| * | | | Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internalJunio C Hamano2019-04-195-482/+553
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/perf-aggregate-wo-libjson'Junio C Hamano2019-05-131-2/+2
|\ \ \ \ \ \
| * | | | | | t/perf: depend on perl JSON only when using --codespeedJeff King2019-04-241-2/+2
* | | | | | | Merge branch 'dl/rev-tilde-doc-clarify'Junio C Hamano2019-05-131-15/+14
|\ \ \ \ \ \ \
| * | | | | | | revisions.txt: remove ambibuity between <rev>:<path> and :<path>Andreas Heiduk2019-05-081-5/+2
| * | | | | | | revisions.txt: mention <rev>~ formDenton Liu2019-05-081-1/+3
| * | | | | | | revisions.txt: mark optional rev arguments with []Denton Liu2019-05-081-5/+5
| * | | | | | | revisions.txt: change "rev" to "<rev>"Denton Liu2019-05-081-4/+4
* | | | | | | | Merge branch 'jc/make-dedup-ls-files-output'Junio C Hamano2019-05-131-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: dedup list of files obtained from ls-filesJunio C Hamano2019-04-221-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/ls-files-doc-markup-fix'Junio C Hamano2019-05-131-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | doc/ls-files: put nested list for "-t" option into blockJeff King2019-04-231-0/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/p5302-avoid-collision-check-cost'Junio C Hamano2019-05-131-13/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | p5302: create the repo in each index-pack testJeff King2019-04-231-13/+18
| |/ / / / / / /
* | | | | | | | Merge branch 'dl/no-extern-in-func-decl'Junio C Hamano2019-05-1370-1082/+1082
|\ \ \ \ \ \ \ \
| * | | | | | | | *.[ch]: manually align parameter listsDenton Liu2019-05-0544-202/+202
| * | | | | | | | *.[ch]: remove extern from function declarations using sedDenton Liu2019-05-0511-49/+49
| * | | | | | | | *.[ch]: remove extern from function declarations using spatchDenton Liu2019-05-0570-885/+885
* | | | | | | | | Merge branch 'ew/repack-with-bitmaps-by-default'Junio C Hamano2019-05-138-13/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pack-objects: default to writing bitmap hash-cacheJeff King2019-03-185-9/+4
| * | | | | | | | | t5310: correctly remove bitmaps for jgit testJeff King2019-03-181-1/+1
| * | | | | | | | | repack: enable bitmaps by default on bare reposEric Wong2019-03-183-3/+23
* | | | | | | | | | Merge branch 'js/partial-clone-connectivity-check'Junio C Hamano2019-05-134-2/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t/perf: add perf script for partial clonesJeff King2019-05-051-0/+26
| * | | | | | | | | | clone: do faster object check for partial clonesJosh Steadmon2019-04-213-2/+29
* | | | | | | | | | | Merge branch 'jh/trace2-sid-fix'Junio C Hamano2019-05-1329-216/+758
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | trace2: fixup access problem on /etc/gitconfig in read_very_early_configJeff Hostetler2019-05-072-1/+5
| * | | | | | | | | | | trace2: update docs to describe system/global config settingsJeff Hostetler2019-04-164-67/+152